feat：认证

.env

@@ -5,8 +5,9 @@ SHOPRO_VERSION=v2.4.1
 SHOPRO_API_PATH=/app-api
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV == development）
-SHOPRO_DEV_BASE_URL=http://127.0.0.1:48083
+# SHOPRO_DEV_BASE_URL=http://127.0.0.1:48083
 # SHOPRO_DEV_BASE_URL = http://chatapi.zianxin.com
+SHOPRO_DEV_BASE_URL=https://rj4jv5rwqs.by.takin.cc
 
 # 后端接口 - 正式环境（通过 process.env.NODE_ENV != development）
 SHOPRO_BASE_URL=http://chatapi.zianxin.com

src/manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "荷塘月色",
-    "appid" : "__UNI__5B53E65",
+    "appid" : "__UNI__0A84F60",
     "description" : "聊天交友app",
     "versionName" : "0.0.0",
-    "versionCode" : 0,
+    "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
@@ -122,9 +122,9 @@
                 "iosStyle" : "common",
                 "useOriginalMsgbox" : true,
                 "android" : {
-                    "hdpi" : "C:/Users/20513/Pictures/login-bg.png",
-                    "xhdpi" : "C:/Users/20513/Pictures/login-bg.png",
-                    "xxhdpi" : "C:/Users/20513/Pictures/login-bg.png"
+                    "hdpi" : "unpackage/res/icons/20x20.png",
+                    "xhdpi" : "unpackage/res/icons/20x20.png",
+                    "xxhdpi" : "unpackage/res/icons/20x20.png"
                 }
             },
             "icons" : {

src/pages/user/info.vue

@@ -1,33 +1,16 @@
 <!-- 用户信息 -->
 <template>
   <s-layout title="用户信息" class="set-userinfo-wrap">
-    <uni-forms
-      :model="state.model"
-      :rules="state.rules"
-      labelPosition="left"
-      border
-      class="form-box"
-    >
+    <uni-forms :model="state.model" :rules="state.rules" labelPosition="left" border class="form-box">
       <!-- 头像 -->
       <view class="ss-flex ss-row-center ss-col-center ss-p-t-60 ss-p-b-0 bg-white">
         <view class="header-box-content">
-          <su-image
-            class="content-img"
-            isPreview
-            :current="0"
-            :src="state.model?.avatar || sheep.$url.static('/static/img/shop/default_avatar.png')"
-            :height="160"
-            :width="160"
-            :radius="80"
-            mode="scaleToFill"
-          />
+          <su-image class="content-img" isPreview :current="0"
+            :src="state.model?.avatar || sheep.$url.static('/static/img/shop/default_avatar.png')" :height="160"
+            :width="160" :radius="80" mode="scaleToFill" />
           <view class="avatar-action">
             <!-- #ifdef MP -->
-            <button
-              class="ss-reset-button avatar-action-btn"
-              open-type="chooseAvatar"
-              @chooseavatar="onChooseAvatar"
-            >
+            <button class="ss-reset-button avatar-action-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
               修改
             </button>
             <!-- #endif -->
@@ -41,25 +24,16 @@
       <view class="bg-white ss-p-x-30">
         <!-- 昵称 + 性别 -->
         <uni-forms-item name="nickname" label="昵称">
-          <uni-easyinput
-            v-model="state.model.nickname"
-            type="nickname"
-            placeholder="设置昵称"
-            :inputBorder="false"
-            :placeholderStyle="placeholderStyle"
-          />
+          <uni-easyinput v-model="state.model.nickname" type="nickname" placeholder="设置昵称" :inputBorder="false"
+            :placeholderStyle="placeholderStyle" />
         </uni-forms-item>
         <uni-forms-item name="sex" label="性别">
           <view class="ss-flex ss-col-center ss-h-100">
             <radio-group @change="onChangeGender" class="ss-flex ss-col-center">
               <label class="radio" v-for="item in sexRadioMap" :key="item.value">
                 <view class="ss-flex ss-col-center ss-m-r-32">
-                  <radio
-                    :value="item.value"
-                    color="var(--ui-BG-Main)"
-                    style="transform: scale(0.8)"
-                    :checked="parseInt(item.value) === state.model?.sex"
-                  />
+                  <radio :value="item.value" color="var(--ui-BG-Main)" style="transform: scale(0.8)"
+                    :checked="parseInt(item.value) === state.model?.sex" />
                   <view class="gender-name">{{ item.name }}</view>
                 </view>
               </label>
@@ -68,15 +42,8 @@
         </uni-forms-item>
 
         <uni-forms-item name="mobile" label="手机号" @tap="onChangeMobile">
-          <uni-easyinput
-            v-model="userInfo.mobile"
-            placeholder="请绑定手机号"
-            :inputBorder="false"
-            disabled
-            :styles="{ disableColor: '#fff' }"
-            :placeholderStyle="placeholderStyle"
-            :clearable="false"
-          >
+          <uni-easyinput v-model="userInfo.mobile" placeholder="请绑定手机号" :inputBorder="false" disabled
+            :styles="{ disableColor: '#fff' }" :placeholderStyle="placeholderStyle" :clearable="false">
             <template v-slot:right>
               <view class="ss-flex ss-col-center">
                 <su-radio v-if="userInfo.verification?.mobile" :modelValue="true" />
@@ -89,22 +56,12 @@
         </uni-forms-item>
 
         <uni-forms-item name="password" label="登录密码" @tap="onSetPassword">
-          <uni-easyinput
-            v-model="userInfo.password"
-            placeholder="点击修改登录密码"
-            :inputBorder="false"
-            :styles="{ disableColor: '#fff' }"
-            disabled
-            placeholderStyle="color:#BBBBBB;font-size:28rpx;line-height:normal"
-            :clearable="false"
-          >
+          <uni-easyinput v-model="userInfo.password" placeholder="点击修改登录密码" :inputBorder="false"
+            :styles="{ disableColor: '#fff' }" disabled
+            placeholderStyle="color:#BBBBBB;font-size:28rpx;line-height:normal" :clearable="false">
             <template v-slot:right>
               <view class="ss-flex ss-col-center">
-                <su-radio
-                  class="ss-flex"
-                  v-if="userInfo.verification?.password"
-                  :modelValue="true"
-                />
+                <su-radio class="ss-flex" v-if="userInfo.verification?.password" :modelValue="true" />
                 <button v-else class="ss-reset-button ss-flex ss-col-center ss-row-center">
                   <text class="_icon-forward" style="color: #bbbbbb; font-size: 26rpx" />
                 </button>
@@ -116,14 +73,8 @@
 
       <view class="bg-white ss-m-t-14">
         <uni-list>
-          <uni-list-item
-            clickable
-            @tap="sheep.$router.go('/pages/user/address/list')"
-            title="地址管理"
-            showArrow
-            :border="false"
-            class="list-border"
-          />
+          <uni-list-item clickable @tap="sheep.$router.go('/pages/user/address/list')" title="地址管理" showArrow
+            :border="false" class="list-border" />
         </uni-list>
       </view>
     </uni-forms>
@@ -133,24 +84,15 @@
       <view class="title-box ss-p-l-30">第三方账号绑定</view>
       <view class="account-list ss-flex ss-row-between">
         <view v-if="'WechatOfficialAccount' === sheep.$platform.name" class="ss-flex ss-col-center">
-          <image
-            class="list-img"
-            :src="sheep.$url.static('/static/img/shop/platform/WechatOfficialAccount.png')"
-          />
+          <image class="list-img" :src="sheep.$url.static('/static/img/shop/platform/WechatOfficialAccount.png')" />
           <text class="list-name">微信公众号</text>
         </view>
         <view v-if="'WechatMiniProgram' === sheep.$platform.name" class="ss-flex ss-col-center">
-          <image
-            class="list-img"
-            :src="sheep.$url.static('/static/img/shop/platform/WechatMiniProgram.png')"
-          />
+          <image class="list-img" :src="sheep.$url.static('/static/img/shop/platform/WechatMiniProgram.png')" />
           <text class="list-name">微信小程序</text>
         </view>
         <view v-if="'App' === sheep.$platform.name" class="ss-flex ss-col-center">
-          <image
-            class="list-img"
-            :src="sheep.$url.static('/static/img/shop/platform/wechat.png')"
-          />
+          <image class="list-img" :src="sheep.$url.static('/static/img/shop/platform/wechat.png')" />
           <text class="list-name">微信开放平台</text>
         </view>
         <view class="ss-flex ss-col-center">
@@ -159,11 +101,7 @@
             <text class="name">{{ state.thirdInfo.nickname }}</text>
           </view>
           <view class="bind-box ss-m-l-20">
-            <button
-              v-if="state.thirdInfo.openid"
-              class="ss-reset-button relieve-btn"
-              @tap="unBindThirdOauth"
-            >
+            <button v-if="state.thirdInfo.openid" class="ss-reset-button relieve-btn" @tap="unBindThirdOauth">
               解绑
             </button>
             <button v-else class="ss-reset-button bind-btn" @tap="bindThirdOauth">绑定</button>
@@ -181,287 +119,290 @@
 </template>
 
 <script setup>
-  import { computed, reactive, onBeforeMount } from 'vue';
-  import sheep from '@/sheep';
-  import { clone } from 'lodash-es';
-  import { showAuthModal } from '@/sheep/hooks/useModal';
-  import UserApi from '@/sheep/api/member/user';
-  import {
-    chooseAndUploadFile,
-    uploadFilesFromPath,
-  } from '@/sheep/components/s-uploader/choose-and-upload-file';
+import { computed, reactive, onBeforeMount } from 'vue';
+import sheep from '@/sheep';
+import { clone } from 'lodash-es';
+import { showAuthModal } from '@/sheep/hooks/useModal';
+import UserApi from '@/sheep/api/member/user';
+import {
+  chooseAndUploadFile,
+  uploadFilesFromPath,
+} from '@/sheep/components/s-uploader/choose-and-upload-file';
 
-  const state = reactive({
-    model: {}, // 个人信息
-    rules: {},
-    thirdInfo: {}, // 社交用户的信息
-  });
+const state = reactive({
+  model: {}, // 个人信息
+  rules: {},
+  thirdInfo: {}, // 社交用户的信息
+});
 
-  const placeholderStyle = 'color:#BBBBBB;font-size:28rpx;line-height:normal';
+const placeholderStyle = 'color:#BBBBBB;font-size:28rpx;line-height:normal';
 
-  const sexRadioMap = [
-    {
-      name: '男',
-      value: '1',
+const sexRadioMap = [
+  {
+    name: '男',
+    value: '1',
+  },
+  {
+    name: '女',
+    value: '2',
+  },
+];
+
+const userInfo = computed(() => sheep.$store('user').userInfo);
+
+// 选择性别
+function onChangeGender(e) {
+  state.model.sex = e.detail.value;
+}
+
+// 修改手机号
+const onChangeMobile = () => {
+  showAuthModal('changeMobile');
+};
+
+// 选择微信的头像，进行上传
+async function onChooseAvatar(e) {
+  debugger;
+  const tempUrl = e.detail.avatarUrl || '';
+  if (!tempUrl) return;
+  const files = await uploadFilesFromPath(tempUrl);
+  if (files.length > 0) {
+    state.model.avatar = files[0].url;
+  }
+}
+
+// 手动选择头像，进行上传
+async function onChangeAvatar() {
+  const files = await chooseAndUploadFile({ type: 'image' });
+  if (files.length > 0) {
+    state.model.avatar = files[0].url;
+  }
+}
+
+// 修改密码
+function onSetPassword() {
+  showAuthModal('changePassword');
+}
+
+// 绑定第三方账号
+async function bindThirdOauth() {
+  let result = await sheep.$platform.useProvider('wechat').bind();
+  if (result) {
+    await getUserInfo();
+  }
+}
+
+// 解绑第三方账号
+function unBindThirdOauth() {
+  uni.showModal({
+    title: '解绑提醒',
+    content: '解绑后您将无法通过微信登录此账号',
+    cancelText: '再想想',
+    confirmText: '确定',
+    success: async function (res) {
+      if (!res.confirm) {
+        return;
+      }
+      const result = await sheep.$platform.useProvider('wechat').unbind(state.thirdInfo.openid);
+      if (result) {
+        await getUserInfo();
+      }
     },
-    {
-      name: '女',
-      value: '2',
-    },
-  ];
-
-  const userInfo = computed(() => sheep.$store('user').userInfo);
-
-  // 选择性别
-  function onChangeGender(e) {
-    state.model.sex = e.detail.value;
-  }
-
-  // 修改手机号
-  const onChangeMobile = () => {
-    showAuthModal('changeMobile');
-  };
-
-  // 选择微信的头像，进行上传
-  async function onChooseAvatar(e) {
-    debugger;
-    const tempUrl = e.detail.avatarUrl || '';
-    if (!tempUrl) return;
-    const files = await uploadFilesFromPath(tempUrl);
-    if (files.length > 0) {
-      state.model.avatar = files[0].url;
-    }
-  }
-
-  // 手动选择头像，进行上传
-  async function onChangeAvatar() {
-    const files = await chooseAndUploadFile({ type: 'image' });
-    if (files.length > 0) {
-      state.model.avatar = files[0].url;
-    }
-  }
-
-  // 修改密码
-  function onSetPassword() {
-    showAuthModal('changePassword');
-  }
-
-  // 绑定第三方账号
-  async function bindThirdOauth() {
-    let result = await sheep.$platform.useProvider('wechat').bind();
-    if (result) {
-      await getUserInfo();
-    }
-  }
-
-  // 解绑第三方账号
-  function unBindThirdOauth() {
-    uni.showModal({
-      title: '解绑提醒',
-      content: '解绑后您将无法通过微信登录此账号',
-      cancelText: '再想想',
-      confirmText: '确定',
-      success: async function (res) {
-        if (!res.confirm) {
-          return;
-        }
-        const result = await sheep.$platform.useProvider('wechat').unbind(state.thirdInfo.openid);
-        if (result) {
-          await getUserInfo();
-        }
-      },
-    });
-  }
-
-  // 保存信息
-  async function onSubmit() {
-    const { code } = await UserApi.updateUser({
-      avatar: state.model.avatar,
-      nickname: state.model.nickname,
-      sex: state.model.sex,
-    });
-    if (code === 0) {
-      await getUserInfo();
-    }
-  }
-
-  // 获得用户信息
-  const getUserInfo = async () => {
-    // 个人信息
-    const userInfo = await sheep.$store('user').getInfo();
-    state.model = clone(userInfo);
-
-    // 获得社交用户的信息
-    if (sheep.$platform.name !== 'H5') {
-      const result = await sheep.$platform.useProvider('wechat').getInfo();
-      state.thirdInfo = result || {};
-    }
-  };
-
-  onBeforeMount(() => {
-    getUserInfo();
   });
+}
+
+// 保存信息
+async function onSubmit() {
+  const { code } = await UserApi.updateUser({
+    avatar: state.model.avatar,
+    nickname: state.model.nickname,
+    sex: state.model.sex,
+  });
+  if (code === 0) {
+    await getUserInfo();
+  }
+}
+
+// 获得用户信息
+const getUserInfo = async () => {
+  // 个人信息
+  const userInfo = await sheep.$store('user').getInfo();
+  state.model = clone(userInfo);
+
+  // 获得社交用户的信息
+  if (sheep.$platform.name !== 'H5') {
+    const result = await sheep.$platform.useProvider('wechat').getInfo();
+    state.thirdInfo = result || {};
+  }
+};
+
+onBeforeMount(() => {
+  getUserInfo();
+});
 </script>
 
 <style lang="scss" scoped>
-  :deep() {
-    .uni-file-picker {
-      border-radius: 50%;
-    }
-
-    .uni-file-picker__container {
-      margin: -14rpx -12rpx;
-    }
-
-    .file-picker__progress {
-      height: 0 !important;
-    }
-
-    .uni-list-item__content-title {
-      font-size: 28rpx !important;
-      color: #333333 !important;
-      line-height: normal !important;
-    }
-
-    .uni-icons {
-      font-size: 40rpx !important;
-    }
-
-    .is-disabled {
-      color: #333333;
-    }
+:deep() {
+  .uni-file-picker {
+    border-radius: 50%;
   }
 
-  :deep(.disabled) {
-    opacity: 1;
+  .uni-file-picker__container {
+    margin: -14rpx -12rpx;
   }
 
-  .gender-name {
-    font-size: 28rpx;
-    font-weight: 500;
-    line-height: normal;
+  .file-picker__progress {
+    height: 0 !important;
+  }
+
+  .uni-list-item__content-title {
+    font-size: 28rpx !important;
+    color: #333333 !important;
+    line-height: normal !important;
+  }
+
+  .uni-icons {
+    font-size: 40rpx !important;
+  }
+
+  .is-disabled {
     color: #333333;
   }
+}
 
-  .title-box {
-    font-size: 28rpx;
-    font-weight: 500;
-    color: #666666;
-    line-height: 100rpx;
-  }
+:deep(.disabled) {
+  opacity: 1;
+}
 
-  .logout-btn {
-    width: 710rpx;
-    height: 80rpx;
-    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-    border-radius: 40rpx;
-    font-size: 30rpx;
-    font-weight: 500;
-    color: $white;
-  }
+.gender-name {
+  font-size: 28rpx;
+  font-weight: 500;
+  line-height: normal;
+  color: #333333;
+}
 
-  .radio-dark {
-    filter: grayscale(100%);
-    filter: gray;
-    opacity: 0.4;
-  }
+.title-box {
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #666666;
+  line-height: 100rpx;
+}
 
-  .content-img {
-    border-radius: 50%;
-  }
-  .header-box-content {
-    position: relative;
-    width: 160rpx;
-    height: 160rpx;
-    overflow: hidden;
-    border-radius: 50%;
-  }
-  .avatar-action {
-    position: absolute;
-    left: 50%;
-    transform: translateX(-50%);
-    bottom: 0;
-    z-index: 1;
+.logout-btn {
+  width: 710rpx;
+  height: 80rpx;
+  background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+  border-radius: 40rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  color: $white;
+}
+
+.radio-dark {
+  filter: grayscale(100%);
+  filter: gray;
+  opacity: 0.4;
+}
+
+.content-img {
+  border-radius: 50%;
+}
+
+.header-box-content {
+  position: relative;
+  width: 160rpx;
+  height: 160rpx;
+  overflow: hidden;
+  border-radius: 50%;
+}
+
+.avatar-action {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0;
+  z-index: 1;
+  width: 160rpx;
+  height: 46rpx;
+  background: rgba(#000000, 0.3);
+
+  .avatar-action-btn {
     width: 160rpx;
     height: 46rpx;
-    background: rgba(#000000, 0.3);
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #ffffff;
+  }
+}
 
-    .avatar-action-btn {
-      width: 160rpx;
-      height: 46rpx;
-      font-weight: 500;
-      font-size: 24rpx;
-      color: #ffffff;
-    }
+// 绑定项
+.account-list {
+  background-color: $white;
+  height: 100rpx;
+  padding: 0 20rpx;
+
+  .list-img {
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 10rpx;
   }
 
-  // 绑定项
-  .account-list {
-    background-color: $white;
-    height: 100rpx;
-    padding: 0 20rpx;
-
-    .list-img {
-      width: 40rpx;
-      height: 40rpx;
-      margin-right: 10rpx;
-    }
-
-    .list-name {
-      font-size: 28rpx;
-      color: #333333;
-    }
-
-    .info {
-      .avatar {
-        width: 38rpx;
-        height: 38rpx;
-        border-radius: 50%;
-        overflow: hidden;
-      }
-
-      .name {
-        font-size: 28rpx;
-        font-weight: 400;
-        color: $dark-9;
-      }
-    }
-
-    .bind-box {
-      width: 100rpx;
-      height: 50rpx;
-      line-height: normal;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      font-size: 24rpx;
-
-      .bind-btn {
-        width: 100%;
-        height: 100%;
-        border-radius: 25rpx;
-        background: #f4f4f4;
-        color: #999999;
-      }
-      .relieve-btn {
-        width: 100%;
-        height: 100%;
-        border-radius: 25rpx;
-        background: var(--ui-BG-Main-opacity-1);
-        color: var(--ui-BG-Main);
-      }
-    }
-  }
-
-  .list-border {
+  .list-name {
     font-size: 28rpx;
-    font-weight: 400;
     color: #333333;
-    border-bottom: 2rpx solid #eeeeee;
   }
 
-  image {
-    width: 100%;
-    height: 100%;
+  .info {
+    .avatar {
+      width: 38rpx;
+      height: 38rpx;
+      border-radius: 50%;
+      overflow: hidden;
+    }
+
+    .name {
+      font-size: 28rpx;
+      font-weight: 400;
+      color: $dark-9;
+    }
   }
+
+  .bind-box {
+    width: 100rpx;
+    height: 50rpx;
+    line-height: normal;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 24rpx;
+
+    .bind-btn {
+      width: 100%;
+      height: 100%;
+      border-radius: 25rpx;
+      background: #f4f4f4;
+      color: #999999;
+    }
+
+    .relieve-btn {
+      width: 100%;
+      height: 100%;
+      border-radius: 25rpx;
+      background: var(--ui-BG-Main-opacity-1);
+      color: var(--ui-BG-Main);
+    }
+  }
+}
+
+.list-border {
+  font-size: 28rpx;
+  font-weight: 400;
+  color: #333333;
+  border-bottom: 2rpx solid #eeeeee;
+}
+
+image {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/pages/wechat/index.vue

@@ -0,0 +1,8 @@
+<template>
+    <s-layout title="用户信息" class="set-userinfo-wrap">
+    </s-layout>
+</template>
+
+<script setup>
+
+</script>