Merge branch 'dev_oa_lu6' into dev

WXD-SEASON\season
2 parents 82bfcbea 9bebc27e
Showing 8 changed files with 224 additions and 4 deletions
app.json
packageA/pages/profile/profile.js
packageA/pages/profile/profile.wxml
packageE/pages/user/nick_avatar_add/nick_avatar_add.js
packageE/pages/user/nick_avatar_add/nick_avatar_add.json
packageE/pages/user/nick_avatar_add/nick_avatar_add.wxml
packageE/pages/user/nick_avatar_add/nick_avatar_add.wxss
pages/user/userinfo/userinfo.js
@@ -211,6 +211,7 @@
                "pages/user/user_fw/user_fw",
                "pages/user/cardinfo/cardinfo",
                "pages/user/nick_avatar/nick_avatar",
+               "pages/user/nick_avatar_add/nick_avatar_add",
                "pages/user/slimming/slimming",
                "pages/user/punchInhistory/punchInhistory",
                "pages/user/grow_value/grow_value",
@@ -297,6 +298,9 @@
     "usingComponents": {
         "customtabbar": "custom-tab-bar/index"
     },
+    "requiredPrivateInfos":[
+      "getLocation"
+    ],
     "useExtendedLib": {
         "weui": true
     },
@@ -474,7 +474,16 @@ Page({
             choice_sort_store: 0
         });
     },
-
+  // 获取用户头像昵称
+  getUserProfile(e) {
+    var th = this;
+    var ob={
+        nickname:this.data.nickname,
+        head_pic:this.data.head_pic,
+    }
+    getApp().globalData.up_nick_avatar=ob;
+    getApp().goto('/packageE/pages/user/nick_avatar_add/nick_avatar_add');
+  },
     //身份证号严格校验
     IdentityIDCard: function (e) {
@@ -783,6 +792,13 @@ Page({
             choice_guide = JSON.parse(JSON.stringify(getApp().globalData.choice_guide));
             getApp().globalData.choice_guide = null;
         }
+        //获取头像和昵称
+        let nick_obj = wx.getStorageSync('nick_obj')
+        if (nick_obj && nick_obj.head_pic && nick_obj.nickname) {
+          this.setData({head_pic: nick_obj.head_pic, nickname: nick_obj.nickname})
+          wx.removeStorageSync('nick_obj')
+        }
+
     },
     getIsBool(){
@@ -1365,7 +1381,10 @@ Page({
             app.my_warnning("请您先阅读和勾选指定的内容", 0, this);
             return false;
         }
-        
+        let uu = getApp().globalData.zc_dd;
+        uu.head_pic=this.data.head_pic
+        uu.nickname=this.data.nickname
+        getApp().globalData.zc_dd=uu
         var post_data = {...getApp().globalData.zc_dd, ...data};
         delete post_data.sessionKey;
@@ -17,8 +17,9 @@
             </view>
           </view>
         </view>
+
       </view>
-			
+			 <button bindtap="getUserProfile" style="margin-left:10rpx;float:left;width: 50rpx;height:50rpx;font-size:20rpx;background:rgba(217, 81, 99, 0.9);" class="flex-center fs30 confirmtext"><text class="iconfont icon-tongbu"></text></button>
     </view>
   </view>
+// pages/user/userfw/userfw.js
+var e = getApp(), os = e.globalData.setting;
+var utils = require('../../../../utils/util.js');
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+
+
+Page({
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        defaultAvatar: os.imghost + "/miniapp/images/no-head.jpg",
+        ob: {},
+        load: 0
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+         if(getApp().globalData.up_nick_avatar){
+              this.setData({
+                  ob: JSON.parse(JSON.stringify(getApp().globalData.up_nick_avatar))
+              })
+              getApp().globalData.up_nick_avatar=null;
+         }
+
+    },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: async function () {
+
+    },
+
+
+    onChooseAvatar: function (e) {
+        console.log(e, 1111);
+        var th = this;
+        getApp().request.uploadFile(os.url + "/api/weshop/comment/uploadCommentImg", {
+            filePath: e.detail.avatarUrl,
+            name: "file",
+            success: function (t) {
+                var u = t.data.data;
+                th.setData({'ob.head_pic': u})
+            }
+        });
+
+    },
+
+    get_val: function (e) {
+        console.log(e, 2222);
+        this.setData({'ob.nickname': e.detail.value})
+    },
+
+    save_data() {
+
+        var that=this;
+        setTimeout(()=>{
+            if (!this.data.ob.head_pic) {
+                wx.showToast({
+                    title: '请选择头像',
+                    icon: 'none',
+                    duration: 2000
+                });
+                return false;
+            }
+
+            if (!this.data.ob.nickname) {
+                wx.showToast({
+                    title: '请输入昵称',
+                    icon: 'none',
+                    duration: 2000
+                });
+                return false;
+            }
+
+            if (this.data.load) return false;
+            this.setData({load: 1})
+
+            wx.showLoading();
+
+            getApp().request.put("/api/weshop/users/update", {
+                data: {
+                    store_id: os.stoid,
+                    user_id: getApp().globalData.user_id,
+                    nickname: this.data.ob.nickname,
+                    head_pic: this.data.ob.head_pic
+
+                },
+                success: function (su) {
+
+                    setTimeout(()=>{
+                        wx.hideLoading();
+                        if (su.data.code == 0) {
+                            wx.navigateBack({delta: 1})
+                        }else{
+                            that.setData({load: 0})
+                            wx.showToast({
+                                title: su.data.msg,
+                                icon: 'none',
+                                duration: 2000
+                            });
+                        }
+                    },1000)
+
+
+                }
+            });
+        },500)
+
+
+    },
+    save_cell(){
+      if (!this.data.ob.head_pic) {
+          wx.showToast({
+              title: '请选择头像',
+              icon: 'none',
+              duration: 2000
+          });
+          return false;
+      }
+      if (!this.data.ob.nickname) {
+          wx.showToast({
+              title: '请输入昵称',
+              icon: 'none',
+              duration: 2000
+          });
+          return false;
+      }
+      if (this.data.load) return false;
+      this.setData({load: 1})
+      wx.setStorageSync('nick_obj', this.data.ob)
+      wx.navigateBack()
+    }
+
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "个人信息",
+  "usingComponents": {}
+}
 \ No newline at end of file
+<view class='page_set'>
+    <view class="item flex jc_sb ai_c">
+        <view>头像</view>
+        <button open-type='chooseAvatar' bind:chooseavatar="onChooseAvatar" class="avatar_btn">
+            <image class="head_img" src="{{ob.head_pic || defaultAvatar}} "></image>
+        </button>
+    </view>
+
+    <view class="item flex jc_sb ai_c">
+        <view>昵称</view>
+        <view>
+            <input class="nick_inp" type="nickname"  placeholder="用户昵称"  value="{{ob.nickname || ''}}" bind:change='get_val'  ></input>
+        </view>
+    </view>
+
+
+
+    <!-- 确认修改按钮 -->
+    <view class="flex-center confirm">
+        <view class="flex-center fs30 confirmtext {{load?'load':''}}" bindtap="save_cell">
+            <view>确认</view>
+        </view>
+    </view>
+
+</view>
 \ No newline at end of file
+.avatar_btn{ width: 60rpx !important;  height: 60rpx !important; border-radius:50%; border: none !important;
+  margin-left:0 !important;margin-right: 0 !important;  }
+.head_img{ width: 60rpx; height: 60rpx; border-radius: 50%}
+
+.page_set{ border-top: 20rpx solid #eee;  }
+.item{ height: 80rpx; border-bottom: 1rpx solid #eee;padding:0 20rpx}
+.nick_inp{ text-align: right; color: #999}
+
+
+.confirm {
+  width: 100%;
+  left: 0rpx;
+  bottom: 0rpx;
+  height: 130rpx;
+  background-color: rgb(255, 255, 255);
+  z-index: 9;
+
+}
+
+.confirmtext {
+  width: 495rpx;
+  height: 65rpx;
+  color: rgb(255, 255, 255);
+  background-color: rgb(214, 1, 33);
+  border-radius: 35rpx;
+}
+
+.load{
+  background-color:#eee !important;
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@ function e(e, a, r) {
     configurable: !0,
     writable: !0
   }) : e[a] = r, e;
-}
+} 
 var a = getApp(),
   r = a.globalData.setting,