Merge branch 'master' of http://git.9026.com/YanaDH/seafood

wechat/app.js

@@ -53,13 +53,77 @@ App({
         });
     },
 
-    login: function (that) {
+    // dologin: function (raw) {
+    //   var pages = getCurrentPages();
+    //   var page = pages[(pages.length - 1)];
+    //   wx.login({
+    //     success: function (res) {
+    //       if (res.code) {
+    //         var code = res.code;
+    //         getApp().request({
+    //           url: api.passport.login,
+    //           method: "post",
+    //           data: {
+    //             code: code,
+    //             user_info: JSON.stringify(raw.userInfo),
+    //             encrypted_data: raw.encryptedData,
+    //             iv: raw.iv,
+    //             signature: raw.signature
+    //           },
+    //           success: function (res) {
+    //             wx.hideLoading();
+    //             if (res.code == 0) {
+    //               wx.setStorageSync("access_token", res.data.access_token);
+    //               wx.setStorageSync("user_info", res.data);
+
+    //               var p = getCurrentPages();
+    //               var parent_id = 0;
+    //               if (p[0].options.user_id != undefined) {
+    //                 var parent_id = p[0].options.user_id;
+    //               }
+    //               else if (p[0].options.scene != undefined) {
+    //                 var parent_id = p[0].options.scene;
+    //               }
+    //               getApp().bindParent({
+    //                   parent_id: parent_id || 0
+    //               });
+
+    //               if (page == undefined) {
+    //                   return;
+
+    //               }
+    //               var loginNoRefreshPage = getApp().loginNoRefreshPage;
+    //               for (var i in loginNoRefreshPage) {
+    //                   if (loginNoRefreshPage[i] === page.route)
+    //                       return;
+    //               }
+    //               wx.redirectTo({
+    //                   url: "/" + page.route + "?" + util.objectToUrlParams(page.options),
+    //                   fail: function () {
+    //                       wx.switchTab({
+    //                           url: "/" + page.route,
+    //                       });
+    //                   },
+    //               });
+              
+    //             } else {
+    //               wx.showToast({
+    //                 title: res.msg
+    //               });
+    //             }
+    //           }
+    //         });
+    //       }
+    //     }
+    //   });
+    // },
+    login: function (e) {
         var pages = getCurrentPages();
         var page = pages[(pages.length - 1)];
-        // wx.showLoading({
-        //     title: "正在登录",
-        //     mask: true,
-        // });
+        wx.showLoading({
+            title: "正在登录",
+            mask: true,
+        });
         wx.login({
             success: function (res) {
                 if (res.code) {
@@ -67,7 +131,7 @@ App({
                     wx.getSetting({
                         success: res => {
                             if (res.authSetting['scope.userInfo']) {
-                                console.log('已经授权')
+                              console.log('已经授权' + code)
                                 // 已经授权，可以直接调用 getUserInfo 
                                 // 获取用户信息
                                 wx.getSetting({
@@ -355,6 +419,10 @@ App({
     'acid': '-1',
     'version': '1.0.0',
     'siteroot': 'https://u5.9026.com/app/index.php',
+    'siteroot': 'https://u5.9026.com/app/index.php',
+    },
+    globalData:{
+    'userInfo': null,
     },
     currentPage: null,
     pageOnLoad: function (page) {

wechat/pages/index/index.js

@@ -1,4 +1,5 @@
 var api = require('../../api.js');
+var util = require('../../utils/utils.js');
 var app = getApp();
 var share_count = 0;
 var width = 260;
@@ -18,7 +19,7 @@ Page({
         time: 0,
         buy_user: '',
         buy_address: '',
-        buy_time: 0,
+        buy_time: 0, 
     },
 
     /**
@@ -47,15 +48,46 @@ Page({
                 buy_user: '',
             })
         }
+        //全局弹出框
+        // if (wx.getStorageSync('user_info')) {
+           
+        // } else if (wx.canIUse('button.open-type.getUserInfo')) {
+        //   // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+        //   // 所以此处加入 callback 以防止这种情况
+        //   app.userInfoReadyCallback = res => {
+        //     console.log('由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回')
+        //     console.log(res)
+        //     app.dologin(res);
+        //   }
+        // } else {
+        //   console.log('open-type=getUserInfo 版本的兼容处理')
+        //   // 在没有 open-type=getUserInfo 版本的兼容处理
+        //   wx.getUserInfo({
+        //     success: res => {
+        //       console.log(res)
+        //       app.dologin(res);
+        //     }
+        //   })
+        // }
+        // console.log(!wx.getStorageSync('user_info') );
+        // if (!wx.getStorageSync('user_info') && wx.canIUse('button.open-type.getUserInfo')){
+        //   this.setData({
+        //     showModal: true
+        //   })
+        // }
     },
     updownComment: function(){
 
     },
-    userInfoHandler: function (e) {
+    getUserInfo: function (e) {
         this.setData({
             showModal: false
         })
-        app.login(this);
+        if (e.detail) {
+          var raw = e.detail;
+          console.log(e.detail);
+          app.dologin(raw);
+        }
     },
 
     /**

wechat/pages/index/index.wxml

@@ -6,7 +6,7 @@
             · 获得你的公开信息（昵称、头像等）
         </view>
         <!-- <button class='btn-agree btn-refuse' bindtap='refuseGetInfo'>拒绝</button> -->
-        <button class='btn-agree' open-type='getUserInfo' bindgetuserinfo='userInfoHandler'>允许</button>
+        <button class='btn-agree' open-type='getUserInfo' bindgetuserinfo='getUserInfo'>允许</button>
     </view>
 </view>
 <view class="after-navber">

wechat/pages/order-refund/order-refund.js

@@ -98,20 +98,20 @@ Page({
             });
         }
     },
-    descInput: function (e) {
+    textInput: function (e) {
         var page = this;
         var type = e.currentTarget.dataset.type;
         var value = e.detail.value;
         if (type == 1) {
             var refund_data_1 = page.data.refund_data_1;
-            refund_data_1.desc = value;
+            refund_data_1.text = value;
             page.setData({
                 refund_data_1: refund_data_1,
             });
         }
         if (type == 2) {
             var refund_data_2 = page.data.refund_data_2;
-            refund_data_2.desc = value;
+            refund_data_2.text = value;
             page.setData({
                 refund_data_2: refund_data_2,
             });
@@ -184,7 +184,9 @@ Page({
 
         /*--退货退款开始--*/
         if (type == 1) {//退货退款
-            var desc = page.data.reason;
+          var desc = page.data.reason;
+          var text = page.data.refund_data_2.text || "";
+          console.log("退货" + text);
             if (desc == undefined) {
                 wx.showToast({
                     title: "请填写退款原因",
@@ -250,6 +252,7 @@ Page({
                         type: 1,
                         order_detail_id: page.data.goods.order_detail_id,
                         desc: desc,
+                        text: text,
                         pic_list: JSON.stringify(pic_url_list),
                     },
                     success: function (res) {
@@ -288,9 +291,11 @@ Page({
         }
         /*--退货退款结束--*/
 
-        /*--换货开始--*/
-        if (type == 2) {//换货
-            var desc = page.data.refund_data_2.desc || "";
+        /*--退款开始--*/
+        if (type == 2) {//退款
+          var desc = page.data.reason;
+          var text = page.data.refund_data_2.text || "";
+          // console.log("退款"+text);
             if (desc.length == 0) {
                 wx.showToast({
                     title: "请填写退款说明",
@@ -348,6 +353,7 @@ Page({
                         type: 2,
                         order_detail_id: page.data.goods.order_detail_id,
                         desc: desc,
+                        text: text,
                         pic_list: JSON.stringify(pic_url_list),
                     },
                     success: function (res) {

wechat/pages/order-refund/order-refund.wxml

@@ -50,7 +50,7 @@
                 <text class="form-label">上传凭证</text>
             </view> -->
             <view class="mb-20">
-                <textarea placeholder='请填写退货说明...'></textarea>
+                <textarea style="width: 100%;padding: 0;" rows="2" bindinput="textInput" data-type="2" placeholder='请填写退货说明...'></textarea>
             </view> 
             <view class="image-list">
                 <view class="image-preview" wx:for="{{refund_data_1.pic_list}}" data-index="{{index}}">
@@ -68,15 +68,21 @@
 
 
      <view class="switch-body {{switch_tab_2}}">
-        <view class="flex-row bg-white form-row mb-20">
-            <view class="flex-grow-0">
-                <text class="form-label">退款说明</text>
-            </view>
-            <view class="flex-grow-1">
-                <textarea style="width: 100%;padding: 0;" rows="2" bindinput="descInput" data-type="2"
-                          placeholder="请输入退款说明"></textarea>
+
+        <view class="bg-white mb-20">
+            <view class='reason-item'>
+                <navigator url='/pages/order-refund-reason/order-refund-reason?order_detail_id={{order_detail_id}}' class="flex-grow-1 flex-row">
+                    退货原因
+                    <view class="flex-grow-1 flex-x-center flex-y-center">
+                        {{reason}}
+                        <image style='width:12rpx; margin-left: 20rpx;' mode='widthFix' src='/images/icon-jiantou-r.png'></image>
+                    </view>
+                </navigator> 
             </view>
         </view>
+        <view class="flex-row bg-white form-row mb-20">
+          <textarea style="width: 100%;padding: 0;" rows="2" bindinput="textInput" data-type="2" placeholder="请填写退款说明"></textarea>
+        </view>
         <view class="bg-white form-row mb-20">
             <!-- <view class="mb-20">
                 <text class="form-label">上传凭证</text>