From ef14e486dad7619b754c434b8dd05f31e4a2ec2d Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 15 Dec 2023 11:20:47 +0800
Subject: [PATCH] OA单的工作内容的优化

---
 packageE/pages/user/labels/labels.js               | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 packageE/pages/user/labels/labels.wxml             | 17 ++++++++++++++---
 packageE/pages/user/monthgiftbag/monthgiftbag.wxml |  8 +++++++-
 pages/giftpack/mygiftpack/mygiftpack.wxml          |  6 +++++-
 4 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/packageE/pages/user/labels/labels.js b/packageE/pages/user/labels/labels.js
index f2c92d5..af9a316 100644
--- a/packageE/pages/user/labels/labels.js
+++ b/packageE/pages/user/labels/labels.js
@@ -120,7 +120,7 @@ Page({
     }
 
     if(options.is_reg){
-       this.data.is_reg=1;
+       this.setData({is_reg:1})
     }
 
     th.query_nolabels();
@@ -312,12 +312,12 @@ Page({
             },
             failStatus: function (t) {
                 wx.hideLoading();
-                th.setData({loading: 0});
+                th.setData({loading: 0,is_check:0});
                 return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
             },
             fail: function (t) {
                 wx.hideLoading();
-                th.setData({loading: 0});
+                th.setData({loading: 0,is_check:0});
                 return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
             }
         });
@@ -416,5 +416,54 @@ Page({
    */
   onShow: function() {
 
+  },
+
+  //会员点击了跳过，就要注册
+  goto_user(e){
+    var th=this;
+    if(this.data.is_check) return false;
+    wx.showLoading({
+      title: "处理中.",
+      mask: true
+    })
+
+    this.setData({ is_check: 1 })
+
+    app.request.get("/api/weshop/users/thirdLogin", {
+      data: getApp().globalData.zc_dd,
+      success: function (e) {
+        wx.hideLoading();
+        if (e.data.code == 0) {
+          app.globalData.user_id = e.data.data.user_id;
+        } else {
+          return app.showWarning("授权登入失败！" + e.data.msg);
+        }
+        getApp().globalData.login_back = 1;
+        wx.setStorageSync("userinfo", e.data.data);
+        wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(app.globalData.userInfo.head_pic);
+
+        //-- 注册的跳转 --
+        getApp().go_to_page(th.data.is_reg,function (){
+          // wx.navigateBack({ delta: 1 })
+          wx.reLaunch({
+            url: '/pages/user/index/index',
+          })
+        })
+
+      },
+      failStatus: function (t) {
+        wx.hideLoading();
+        th.setData({loading: 0,is_check:0});
+        return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
+      },
+      fail: function (t) {
+        wx.hideLoading();
+        th.setData({loading: 0,is_check:0});
+        return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
+      }
+    });
+
+
   }
+
 })
\ No newline at end of file
diff --git a/packageE/pages/user/labels/labels.wxml b/packageE/pages/user/labels/labels.wxml
index 123a319..8513599 100644
--- a/packageE/pages/user/labels/labels.wxml
+++ b/packageE/pages/user/labels/labels.wxml
@@ -4,9 +4,20 @@
     <!-- 兴趣标签标题 -->
     <view class="flex-vertical-between labels_head">
       <view class="fs36">兴趣标签</view>
-      <view  class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
-        <view>关闭</view>
-      </view>
+
+      <!-- 如果是注册的时候 -->
+      <block wx:if="{{is_reg }}">
+          <view wx:if="{{!label_required}}"  class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto_user">
+            <view>跳过</view>
+          </view>
+      </block>
+      <block wx:else>
+          <view  class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
+            <view>关闭</view>
+          </view>
+      </block>
+
+
     
     </view>
 
diff --git a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
index 720fe7c..2fe4634 100644
--- a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
+++ b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
@@ -66,6 +66,10 @@
             <block wx:if="{{item.payIntegral>0}}">
               <text>{{item.payIntegral+"积分"}}</text>
             </block>
+
+
+            <!-- (121658)OA单规定取消，2023-12-15   -->
+            <!--
             <block wx:if="{{item.actType==1}}">
               <text>{{item.actTitle}}</text>
             </block>
@@ -80,7 +84,9 @@
             </block>
             <block wx:if="{{item.actType==5}}">
               <text>{{item.actTitle}}</text>
-            </block>
+            </block>-->
+
+
           </view>
           <view class="content_ware_price no_line_c">
             <text >{{"购买时间："+item.pay_time}}</text>
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index c4095d3..5405cf3 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -63,6 +63,9 @@
             <block wx:if="{{item.actType==0&item.payIntegral>0}}">
               <text>{{item.payIntegral+"积分"}}</text>
             </block>
+
+            <!-- (121658)OA单规定取消，2023-12-15   -->
+            <!--
             <block wx:if="{{item.actType==1}}">
               <text>{{item.actTitle}}</text>
             </block>
@@ -77,7 +80,8 @@
             </block>
             <block wx:if="{{item.actType==5}}">
               <text>{{item.actTitle}}</text>
-            </block>
+            </block>-->
+
           </view>
           <view class="content_ware_price no_line_c">
             <text >{{"零售价：￥"+item.giftPosPrice}}</text>
--
libgit2 0.21.4