Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

后端研发-苏泰源
2 parents a460f663 b580626d
Showing 3 changed files with 27 additions and 23 deletions
packageD/pages/AI-test-skin/index/aiskin.js
pages/goods/goodsInfo/goodsInfo.js
pages/user/return_goods/return_goods.js
 /*
  * @Author: abson
  * @Date: 2022-02-11 14:13:05
- * @LastEditTime: 2022-02-22 15:17:48
+ * @LastEditTime: 2022-03-26 17:03:01
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\index\aiskin.js
@@ -25,11 +25,13 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-      var user=getApp().globalData.userInfo;
-      if(!user){
-          let url = "/pages/togoin/togoin";
-          app.goto(url);
-      }
+        getApp().globalData.user_id = options?.user_id;
+        getApp().getUserFir();
+        var user = getApp().globalData.userInfo;
+        if (!user || !getApp().globalData.user_id) {
+            let url = "/pages/togoin/togoin";
+            app.goto(url);
+        }
     },
     /**
@@ -57,8 +59,8 @@ Page({
     goto(e) {
         this.check_num(function () {
-            var user=getApp().globalData.userInfo;
-            if(!user){
+            var user = getApp().globalData.userInfo;
+            if (!user) {
                 wx.showToast({
                     title: "请先授权登陆",
                     icon: 'none',
@@ -68,14 +70,14 @@ Page({
                 setTimeout(function () {
                     let url = "/pages/togoin/togoin";
                     app.goto(url);
-                },1000)
+                }, 1000)
                 return false;
             }
             let url = e.currentTarget.dataset.url;
             app.goto(url);
         })
-        
+
     },
     /**
@@ -102,26 +104,27 @@ Page({
     /**
      * 用户点击右上角分享
      */
-     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
+    onShareAppMessage: function () {
+        getApp().globalData.no_clear = 1
     },
-    check_num:function (func) {
+    check_num: function (func) {
         //判断右没有开AI测肤
-         getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+setting.stoid,{}).then(rs=>{
-            if(rs.data.code!=0 || !rs.data.data){
+        getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + setting.stoid, {}).then(rs => {
+            if (rs.data.code != 0 || !rs.data.data) {
                 wx.showToast({
                     title: "未开通测肤功能，请联系商家",
                     icon: 'none',
                     duration: 3000
                 })
-            }else if(!rs.data.data.skin_num ||  rs.data.data.skin_num<=0){
+            } else if (!rs.data.data.skin_num || rs.data.data.skin_num <= 0) {
                 wx.showToast({
                     title: "测肤功能的使用次数已经达到上限，请联系商家",
                     icon: 'none',
                     duration: 3000
                 })
-            }else{
+            } else {
                 func();
             }
         })
@@ -139,14 +142,14 @@ Page({
                 store_id: setting.stoid,
                 user_id: os.user_id,
                 page: 1,
-                pageSize:1,
+                pageSize: 1,
             }
         });
         // initChart.setOption(option);
         if (res.code == 0 && res.data.pageData.length > 0) {
-            this.setData({show_his:1})
+            this.setData({ show_his: 1 })
         }
     }
-    
-    
+
+
 })
 \ No newline at end of file
@@ -1248,7 +1248,7 @@ Page({
             //让商品带上房间号
             //让商品带上房间号
-            if (th.data.sys_switch.is_skuroom_id == 1) {
+            if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) {
                 if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
                     newd.room_id = getApp().globalData.room_id;
                 }
@@ -1354,7 +1354,7 @@ Page({
             //让商品带上房间号
             //让商品带上房间号
-            if (th.data.sys_switch.is_skuroom_id == 1) {
+            if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) {
                 if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
                     newd.room_id = getApp().globalData.room_id;
                 }
@@ -4243,7 +4243,7 @@ Page({
             }
             //让商品带上房间号
-            if (th.data.sys_switch.is_skuroom_id == 1) {
+            if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) {
                 if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
                     newd.room_id = getApp().globalData.room_id;
                 }
@@ -50,6 +50,7 @@ Page({
             data: {
                goods_id: t.rec_id,
                order_id: t.order_id,
+               store_id:os.stoid
             },
             success: function(t) {
                 console.log('requestReturnGoods');