From cf362e39fb7c49af66cb03898826c3167a7ecb71 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Wed, 2 Aug 2023 15:18:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.wxss                      |  4 ++--
 pages/addressBook/index.wxml  |  2 +-
 pages/enroll/index.js         | 31 ++++++++++++++++---------------
 pages/home/index.json         |  2 +-
 pages/makeInfo/index.wxml     |  4 ++--
 pages/makeInfoSure/index.wxss |  3 +++
 pages/me/index.json           |  2 +-
 pages/me/index.wxml           |  5 +++++
 pages/myInfo/index.wxml       |  9 +++++++--
 pages/success/index.js        |  2 +-
 10 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/app.wxss b/app.wxss
index 795c926..ec67156 100644
--- a/app.wxss
+++ b/app.wxss
@@ -458,13 +458,13 @@ button.weui-btn_primary::after {
 
 button[type="primary"] {
 	color: #ffffff;
-	background-color: #027aff;
+	background-color: var(--color-yc);
 }
 
 .button-hover[type="primary"] {
 	color: #ffffff;
 	/* opacity: 0.8; */
-	background-color: #1f6bbf;
+	background-color: var(--color-ych);
 }
 
 button[disabled][type="primary"] {
diff --git a/pages/addressBook/index.wxml b/pages/addressBook/index.wxml
index bc6b4d3..4a2669f 100644
--- a/pages/addressBook/index.wxml
+++ b/pages/addressBook/index.wxml
@@ -2,7 +2,7 @@
 
   <block>
     <view class="tc" wx:if="{{!hasAddress}}">
-      <i class="t-icon t-icon-dizhi" style=" width: 92px;height: 92px;margin-top: 90px;"></i>
+      <i class="t-icon t-icon-zanwu" style=" width: 92px;height: 92px;margin-top: 90px;"></i>
       <view class="mt20 cccc">暂无收货地址</view>
     </view>
   </block>
diff --git a/pages/enroll/index.js b/pages/enroll/index.js
index 5cf2f38..613466c 100644
--- a/pages/enroll/index.js
+++ b/pages/enroll/index.js
@@ -84,21 +84,22 @@ Page({
       header: app.globalData.headers,
       data: formData,
       success: function (res) {
-      //   wx.redirectTo({
-      //     url: "../success/index?applyType=" + that.data.applyType
-      // });
-        wx.showToast({
-          icon: "success",
-          title: "报名成功",
-          duration: 3000,
-          success(){
-            that.setData({
-              inputUserName:'',
-              phoneNumber:'',
-              btnLoading: false
-            })
-          }
-        });
+        wx.redirectTo({
+          url: "../success/index?applyType=0"
+          //  + that.data.applyType
+      });
+        // wx.showToast({
+        //   icon: "success",
+        //   title: "报名成功",
+        //   duration: 3000,
+        //   success(){
+        //     that.setData({
+        //       inputUserName:'',
+        //       phoneNumber:'',
+        //       btnLoading: false
+        //     })
+        //   }
+        // });
       }
     })      
 
diff --git a/pages/home/index.json b/pages/home/index.json
index 19d83a6..b8b09d2 100644
--- a/pages/home/index.json
+++ b/pages/home/index.json
@@ -1,4 +1,4 @@
 {
-  "navigationBarBackgroundColor":"#027AFF",
+  "navigationBarBackgroundColor":"#0dcc91",
   "navigationBarTextStyle": "white"
 }
\ No newline at end of file
diff --git a/pages/makeInfo/index.wxml b/pages/makeInfo/index.wxml
index f1aa99c..cf00f06 100644
--- a/pages/makeInfo/index.wxml
+++ b/pages/makeInfo/index.wxml
@@ -21,10 +21,10 @@
   </view>
 
   <view class="uploadZheng" hover-class="thover" data-id="1" bindtap="TT">
-    <image src="{{user.idcardImgFrontm != null ? user.idcardImgFrontm : '//matripe.oss-cn-beijing.aliyuncs.com/tuiguang/renxiang.png'}}"></image>
+    <image src="{{user.idcardImgFrontm ? user.idcardImgFrontm : '//matripe.oss-cn-beijing.aliyuncs.com/tuiguang/renxiang.png'}}"></image>
   </view>
   <view class="uploadFan" hover-class="thover" data-id="2" bindtap="TT">
-    <image src="{{user.idcardImgBackm != null ? user.idcardImgBackm : '//matripe.oss-cn-beijing.aliyuncs.com/tuiguang/guohui.png'}}"></image>
+    <image src="{{user.idcardImgBackm ? user.idcardImgBackm : '//matripe.oss-cn-beijing.aliyuncs.com/tuiguang/guohui.png'}}"></image>
   </view>
 
 </view>
diff --git a/pages/makeInfoSure/index.wxss b/pages/makeInfoSure/index.wxss
index 7942dc7..2d66aaf 100644
--- a/pages/makeInfoSure/index.wxss
+++ b/pages/makeInfoSure/index.wxss
@@ -31,4 +31,7 @@ page{
 }
 .mt36{
   margin-top:36px;
+}
+.wx-list-li {
+  padding: 16px 10px;
 }
\ No newline at end of file
diff --git a/pages/me/index.json b/pages/me/index.json
index 2a7f884..cd02d77 100644
--- a/pages/me/index.json
+++ b/pages/me/index.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarBackgroundColor":"#027AFF",
+  "navigationBarBackgroundColor":"#0dcc91",
   "backgroundColor": "#fff",
   "navigationBarTextStyle":"white",
   "navigationBarTitleText": "我的"
diff --git a/pages/me/index.wxml b/pages/me/index.wxml
index 4bea277..34939cc 100644
--- a/pages/me/index.wxml
+++ b/pages/me/index.wxml
@@ -12,7 +12,12 @@
         </view>
         <view class="userName flex-1" style="display: flex;flex-direction: column;justify-content: space-between;padding: 4px 0;">
           <view class="va-center">
+          <block wx:if="{{user.userName !='' && user.userName!= null && user.userName != 'undefined'}}">
             <text class="mr8 fwb" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 160px;font-size:20px;">{{user.userName}}</text>
+          </block>
+          <block wx:else>
+            <open-data type="userNickName" class="mr8 fwb" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 160px;font-size:20px;"></open-data>
+          </block>
             <button wx:if="{{(isLogin && hasUserInfo - 0 == 0) || user.userName =='微信用户'}}" style="position: absolute;top: 26px;opacity: 0;" open-type="getUserInfo" bindtap="getUserInfoBtn">未获取昵称</button>
             <block wx:if="{{isLogin}}">
               <i class="iconfont icon-nv3 f12" style="color:#fb8585;line-height:20px" wx:if="{{user.sex == 2}}"></i>
diff --git a/pages/myInfo/index.wxml b/pages/myInfo/index.wxml
index 3076e82..ce8ab9f 100644
--- a/pages/myInfo/index.wxml
+++ b/pages/myInfo/index.wxml
@@ -28,7 +28,12 @@
         用户名
       </view>
       <view class="section flex-right">
-        <text class="c6 mr8">{{user.userName != null ? user.userName : ''}}</text>
+        <block wx:if="{{user.userName !='' && user.userName!= null && user.userName != 'undefined'}}">
+        <text class="c6 mr8">{{user.userName}}</text>
+        </block>
+        <block wx:else>
+        <text class="c9 mr8">去设置</text>
+      </block>
         <i class="iconfont icon-you f12 c9"></i>
       </view>
     </navigator>
@@ -80,7 +85,7 @@
   <view class="wx-text-list br8 mt10">
     <view class='wx-list-li' style="padding: 14px 10px;">
       <view class='f16 mw-label display-flex'>
-        实名认证<view class='iconfont icon-yirenzheng ysd-base-color fw400 f18 ml4 flex-1' style="line-height:1.3;color: #ff4400;"></view>
+        实名认证<view class='iconfont icon-yirenzheng ysd-base-color fw400 f18 ml4 flex-1'  wx:if="{{user.idauth - 1 == 0}}" style="line-height:1.3;color: #ff4400;"></view>
       </view>
       <view class="section flex-right" bindtap="goAuth" wx:if="{{user.idauth - 1 != 0}}">
         <view class="c9">去认证</view>
diff --git a/pages/success/index.js b/pages/success/index.js
index b72b10a..7b65dc8 100644
--- a/pages/success/index.js
+++ b/pages/success/index.js
@@ -18,7 +18,7 @@ Page({
         var that = this;
 
         if (that.data.applyType == 0) {
-            wx.navigateTo({
+            wx.switchTab({
                 url: "../index/index"
             });
         } else {