wxd / MShopWeApp

Commit 47c80d71a1e8d266598462f765c381819392e108

Authored by WXD-SEASON\season
2 parents 305b6f49 fbbd0cf8

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

Inline Side-by-side
Showing 23 changed files with 494 additions and 146 deletions
@@ -201,18 +201,10 @@ App({ @@ -201,18 +201,10 @@ App({
201 //调用接口判断是不是会员 201 //调用接口判断是不是会员
202 app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { 202 app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
203 if (res.data.code == 0) { 203 if (res.data.code == 0) {
204 -  
205 -  
206 - // ut.m_toast('获取到导购:'+res.data.data.id)  
207 - 204 +
208 app.globalData.guide_id = res.data.data.id; 205 app.globalData.guide_id = res.data.data.id;
209 app.globalData.guide_pick_id = res.data.data.pickup_id; 206 app.globalData.guide_pick_id = res.data.data.pickup_id;
210 -  
211 - // setTimeout(()=>{  
212 -  
213 - // ut.m_toast('globalData中导购id:'+app.globalData.guide_id)  
214 - // },1200)  
215 - 207 +
216 208
217 } 209 }
218 }) 210 })
app.json
  View file @47c80d7
@@ -13,8 +13,7 @@ @@ -13,8 +13,7 @@
13 "pages/activity/seckill_list/seckill_list", 13 "pages/activity/seckill_list/seckill_list",
14 "pages/activity/pind_list/pind_list", 14 "pages/activity/pind_list/pind_list",
15 "pages/team/team_show/team_show", 15 "pages/team/team_show/team_show",
16 - "pages/user/userqy/userqy",  
17 - "pages/user/user_spsy/user_spsy", 16 + "pages/user/userqy/userqy",
18 "pages/user/plus/plus", 17 "pages/user/plus/plus",
19 "pages/user/my_service/i_service", 18 "pages/user/my_service/i_service",
20 "pages/giftpack/birthdaygift/birthdaygift", 19 "pages/giftpack/birthdaygift/birthdaygift",
@@ -251,7 +250,8 @@ @@ -251,7 +250,8 @@
251 "root": "packageH/", 250 "root": "packageH/",
252 "name": "pack8", 251 "name": "pack8",
253 "pages": [ 252 "pages": [
254 - "pages/goodsInfo/goodsInfo" 253 + "pages/goodsInfo/goodsInfo",
  254 + "pages/user/user_spsy/user_spsy"
255 ] 255 ]
256 } 256 }
257 ], 257 ],
packageA/pages/myGift/myGift.wxml
  View file @47c80d7
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </block> 10 </block>
11 <block wx:else> 11 <block wx:else>
12 <view class="top_img rel"> 12 <view class="top_img rel">
13 - <image mode="widthFix" src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image> 13 + <image mode="widthFix" src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=202403'}}" lazy-load="true"></image>
14 <lb_sear id="lb_sear" bindinput_sear="input_sear" bindsearch_lb="search_lb"></lb_sear> 14 <lb_sear id="lb_sear" bindinput_sear="input_sear" bindsearch_lb="search_lb"></lb_sear>
15 </view> 15 </view>
16 </block> 16 </block>
packageA/pages/profile/profile.js
  View file @47c80d7
@@ -1050,7 +1050,22 @@ Page({ @@ -1050,7 +1050,22 @@ Page({
1050 1050
1051 if (e.data.code == 0) { 1051 if (e.data.code == 0) {
1052 app.globalData.user_id = e.data.data.user_id; 1052 app.globalData.user_id = e.data.data.user_id;
1053 - } else { 1053 + }
  1054 + else if(e.data.code==-3){
  1055 + wx.showModal({
  1056 + title: e.data.msg,
  1057 + success: function (e) {
  1058 + if(e.confirm){
  1059 + dd.isreplacemobile=1;
  1060 + if (th.data.loading) return false;
  1061 + th.setData({loading: 1});
  1062 + th.zu_ce(dd);
  1063 + }
  1064 + }
  1065 + });
  1066 + return false;
  1067 + }
  1068 + else {
1054 return ut.m_toast("授权登入失败！" + e.data.msg); 1069 return ut.m_toast("授权登入失败！" + e.data.msg);
1055 } 1070 }
1056 getApp().globalData.login_back = 1; 1071 getApp().globalData.login_back = 1;
packageB/pages/user/user_coupon/c_filter.wxs
  View file @47c80d7
@@ -9,26 +9,42 @@ var filters = { @@ -9,26 +9,42 @@ var filters = {
9 fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') 9 fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
10 return fm; 10 return fm;
11 }, 11 },
  12 + //全场为 红色 商品除了全场为蓝色 卡项为绿色
12 setcolor:function(ind){ 13 setcolor:function(ind){
13 if(ind==0) return "red"; 14 if(ind==0) return "red";
14 - if(ind==1) return "green";  
15 - if(ind==2) return "blue";  
16 - if(ind==11) return "green";  
17 - if(ind==13) return "red"; 15 + if(ind==1) return "blue";
  16 + if(ind==2) return "blue";
  17 + if(ind==11) return "blue";
  18 +
18 if(ind==12) return "blue"; 19 if(ind==12) return "blue";
19 - if(ind==20) return "green";  
20 - if(ind==14) return "red"; 20 + if(ind==13) return "blue";
  21 +
  22 + if(ind==14) return "blue";
  23 + if(ind==20) return "blue";
  24 +
  25 + if(ind==21) return "green";
  26 + if(ind==22) return "green";
  27 +
  28 + if(ind==24) return "green";
  29 + if(ind==25) return "green";
21 return ""; 30 return "";
22 }, 31 },
23 setbgcolor: function (ind) { 32 setbgcolor: function (ind) {
24 - if (ind == 0) return "#ffa1b9";  
25 - if (ind == 1) return "#59e1d2";  
26 - if (ind == 2) return "#a3bcff";  
27 - if (ind == 11) return "#59e1d2";  
28 - if (ind == 12) return "#a3bcff";  
29 - if (ind == 20) return "#6d87cd";  
30 - if (ind==13) return "#ffa1b9";  
31 - if (ind==14) return "#59e1d2"; 33 + if (ind == 0) return "#ffa1b9";//红
  34 + if (ind == 1) return "#a3bcff";//蓝
  35 + if (ind == 2) return "#a3bcff";//蓝
  36 + if (ind == 11) return "#a3bcff";//蓝
  37 + if (ind == 12) return "#a3bcff";//蓝
  38 +
  39 + if (ind==13) return "#a3bcff";//蓝
  40 +
  41 + if (ind==14) return "#a3bcff";//蓝
  42 + if (ind == 20) return "#a3bcff";//蓝
  43 + if (ind==21) return "#59e1d2";//绿
  44 + if (ind==22) return "#59e1d2";//绿
  45 +
  46 + if (ind==24) return "#59e1d2";//绿
  47 + if (ind==25) return "#59e1d2";//绿
32 return ""; 48 return "";
33 }, 49 },
34 50
@@ -38,10 +54,14 @@ var filters = { @@ -38,10 +54,14 @@ var filters = {
38 if (ind == 1) return "品牌"; 54 if (ind == 1) return "品牌";
39 if (ind == 2) return "品类"; 55 if (ind == 2) return "品类";
40 if (ind == 11) return "用途"; 56 if (ind == 11) return "用途";
41 - if (ind == 12) return "分类1"; 57 + if (ind == 12) return "分类一";
42 if (ind == 13) return "自定义"; 58 if (ind == 13) return "自定义";
43 - if (ind == 14) return "分类2";  
44 - if (ind == 20) return "指定单品"; 59 + if (ind == 14) return "分类二";
  60 + if (ind == 20) return "单品";
  61 + if (ind == 21) return "卡项类别";
  62 + if (ind == 22) return "自选项目";
  63 + if (ind == 24) return "全部卡项";
  64 + if (ind == 25) return "卡项";
45 return ""; 65 return "";
46 }, 66 },
47 get_type_card:function(ind){ 67 get_type_card:function(ind){
@@ -49,10 +69,14 @@ var filters = { @@ -49,10 +69,14 @@ var filters = {
49 if (ind == 1) return "指定品牌"; 69 if (ind == 1) return "指定品牌";
50 if (ind == 2) return "指定品类"; 70 if (ind == 2) return "指定品类";
51 if (ind == 11) return "指定用途"; 71 if (ind == 11) return "指定用途";
52 - if (ind == 12) return "指定分类1";  
53 - if (ind == 14) return "指定分类2"; 72 + if (ind == 12) return "指定分类一";
  73 + if (ind == 14) return "指定分类二";
54 if (ind == 13) return "自定义"; 74 if (ind == 13) return "自定义";
55 if (ind == 20) return "指定单品"; 75 if (ind == 20) return "指定单品";
  76 + if (ind == 21) return "卡项类别";
  77 + if (ind == 22) return "自选项目";
  78 + if (ind == 24) return "全部卡项";
  79 + if (ind == 25) return "卡项";
56 return ""; 80 return "";
57 }, 81 },
58 82
packageB/pages/user/user_coupon/user_coupon.js
  View file @47c80d7
@@ -14,6 +14,11 @@ Page({ @@ -14,6 +14,11 @@ Page({
14 GradeId:null, 14 GradeId:null,
15 FormId:null, 15 FormId:null,
16 now:'', 16 now:'',
  17 + ismore: 0, //数据是否全部加载完成
  18 + is_read: 0, //是否查询过我的礼包接口
  19 + curpage: 1, //当前分页数
  20 + pageSize: 10, //页大小
  21 + total: 0, //总数量
17 }, 22 },
18 clik_coupon:function(){ 23 clik_coupon:function(){
19 this.setData({ 24 this.setData({
@@ -41,30 +46,85 @@ Page({ @@ -41,30 +46,85 @@ Page({
41 /** 46 /**
42 * 生命周期函数--监听页面显示 47 * 生命周期函数--监听页面显示
43 */ 48 */
44 - onShow:async function () {  
45 - var th = this,q_list=null;  
46 -  
47 - //--获取列表--  
48 - await getApp().request.promiseGet("/api/weshop/users/grade/wechat/cash/page", {  
49 - data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id}  
50 - }).then(res => {  
51 - q_list = res.data.data.pageData;  
52 - })  
53 - //取分类最后一级  
54 - for(var i in q_list){  
55 - var name=q_list[i].UseObjectName;  
56 - var arr=name.split("\\")  
57 - q_list[i].UseObjectName=arr[arr.length-1];  
58 - q_list[i].Remark = q_list[i].Remark.replace(/\n/g, "\n")  
59 - }  
60 - th.setData({quan_list:q_list});  
61 - 49 + onShow:function () {
  50 + this.getList();
62 }, 51 },
63 52
64 /** 53 /**
65 * 页面上拉触底事件的处理函数 54 * 页面上拉触底事件的处理函数
66 */ 55 */
67 onReachBottom: function () { 56 onReachBottom: function () {
  57 + var th = this;
  58 + if (th.data.total <= th.data.pageSize) return;
  59 + if (th.data.ismore) return;
  60 + th.getList();
  61 +
  62 +
  63 + },
  64 + getList: function () {
  65 +
  66 + if(this.data.ismore) return false;
  67 + if(this.data.searching) return false;
  68 + this.data.searching=1;
  69 +
  70 + wx.showLoading({
  71 + title: '加载中.',
  72 + })
  73 +
  74 + var th = this,q_list=null;
  75 +
  76 + //--获取列表--
  77 + getApp().request.promiseGet("/api/weshop/users/grade/wechat/cash/page", {
  78 + data:{ storeId:os.stoid,
  79 + FormId:th.data.FormId,
  80 + GradeId:th.data.GradeId,
  81 + userId:getApp().globalData.user_id,
  82 + page: th.data.curpage,
  83 + pageSize: th.data.pageSize}
  84 + }).then(res => {
  85 + th.data.searching=0;
  86 + if (utils.ajax_ok(res)){
  87 +
  88 +
  89 + q_list = res.data.data.pageData;
  90 +
  91 + //取分类最后一级
  92 + for(var i in q_list){
  93 + var name=q_list[i].UseObjectName;
  94 + var arr=name.split("\\")
  95 + q_list[i].UseObjectName=arr[arr.length-1];
  96 + q_list[i].Remark = q_list[i].Remark.replace(/\n/g, "\n")
  97 + }
  98 + th.data.curpage++;
  99 +
  100 + var quan_list=th.data.quan_list||[];
  101 +
  102 + quan_list=quan_list.concat(q_list);
  103 + if (quan_list.length>=res.data.data.total) {
  104 + th.setData({
  105 + is_read: 1,
  106 + ismore: 1,
  107 + is_get:1,
  108 + })
  109 + }
  110 + th.setData({
  111 + quan_list:quan_list,
  112 + total: res.data.data.total
  113 + });
  114 + }
  115 + else {
  116 +
  117 + th.setData({
  118 + is_read: 1,
  119 + ismore: 1,
  120 + is_get:1,
  121 + })
  122 + }
  123 + wx.hideLoading();
  124 +
  125 + })
  126 +
  127 +
68 128
69 }, 129 },
70 130
packageB/pages/user/user_coupon/user_coupon.wxml
  View file @47c80d7
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
6 <!-- 券内容 --> 6 <!-- 券内容 -->
7 <view class="q_content"> 7 <view class="q_content">
8 <view class="item" wx:for="{{quan_list}}"> 8 <view class="item" wx:for="{{quan_list}}">
  9 +
  10 +
9 <view class="xc-coupon-frame flex-center"> 11 <view class="xc-coupon-frame flex-center">
10 <view class="coupon-frame flex rel"> 12 <view class="coupon-frame flex rel">
11 <!-- 锯齿 --> 13 <!-- 锯齿 -->
@@ -104,6 +106,11 @@ @@ -104,6 +106,11 @@
104 </view> 106 </view>
105 </view> 107 </view>
106 </view> 108 </view>
  109 +
  110 + <block wx:if="{{is_get}}">
  111 + <!-- 没有更多数据 -->
  112 + <view class="noMore 1">—— 已经到底了 ——</view>
  113 + </block>
107 </view> 114 </view>
108 115
109 <!-- 弹出框扫描 --> 116 <!-- 弹出框扫描 -->
packageB/pages/user/user_coupon/user_coupon.wxss
  View file @47c80d7
@@ -178,4 +178,10 @@ margin:0 0rpx 0 22rpx; @@ -178,4 +178,10 @@ margin:0 0rpx 0 22rpx;
178 .blue{background-color:#5e82e3;} 178 .blue{background-color:#5e82e3;}
179 .g_gray{background-color: #aaaaaa} 179 .g_gray{background-color: #aaaaaa}
180 180
181 -.f_text{text-align: center; height:96rpx; }  
182 \ No newline at end of file 181 \ No newline at end of file
  182 +.f_text{text-align: center; height:96rpx; }
  183 +.noMore {
  184 + padding: 20rpx;
  185 + color: #bbb;
  186 + text-align: center;
  187 + font-size: 22rpx;
  188 +}
183 \ No newline at end of file 189 \ No newline at end of file
packageD/components/diy_login/login.js
  View file @47c80d7
@@ -77,6 +77,10 @@ Component({ @@ -77,6 +77,10 @@ Component({
77 return app.my_warnning("登录需要授权手机号码！", 0, this); 77 return app.my_warnning("登录需要授权手机号码！", 0, this);
78 return false; 78 return false;
79 } 79 }
  80 +
  81 + if(this.data.sub) return false;
  82 + this.setData({ sub: 1 });
  83 +
80 var sessionKey = getApp().globalData.sessionKey; 84 var sessionKey = getApp().globalData.sessionKey;
81 var openid = getApp().globalData.openid; 85 var openid = getApp().globalData.openid;
82 var r = getApp().globalData.getu; 86 var r = getApp().globalData.getu;
@@ -175,103 +179,245 @@ Component({ @@ -175,103 +179,245 @@ Component({
175 }) 179 })
176 }, 180 },
177 181
178 - 182 +
  183 +
179 save_the_data: async function (r, e, sessionKey, openid) { 184 save_the_data: async function (r, e, sessionKey, openid) {
180 var app = getApp(), a = app, th = this; 185 var app = getApp(), a = app, th = this;
181 - var dd = {  
182 - oauth: "miniapp",  
183 - nickname: a.clear_word(r.nickName),  
184 - head_pic: r.avatarUrl,  
185 - sex: r.gender,  
186 - terminal: "miniapp",  
187 - sessionKey: sessionKey,  
188 - openid: openid,  
189 - encryptedData: e.encryptedData,  
190 - iv: e.iv,  
191 - store_id: getApp().globalData.setting.stoid,  
192 - };  
193 - //--如果有邀请人的时候--  
194 - if (th.data.first_leader) {  
195 - //判断一下分享人是不是分享商  
196 - await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + th.data.first_leader, {}).then(res => {  
197 - if (res.data.code == 0) {  
198 - var user = res.data.data;  
199 - if (user.is_distribut == 1) { 186 +
  187 + app.request.get("/api/weshop/manager/managerConfig/get", {
  188 + data: {
  189 + storeId: getApp().globalData.setting.stoid
  190 + },
  191 + success: function (res2) {
  192 + if (res2.data.code == 0) {
  193 + if (res2.data.data.is_newphone == 1) {
  194 + var dd = {
  195 + oauth: "miniapp",
  196 + nickname: a.clear_word(r.nickName),
  197 + head_pic: r.avatarUrl,
  198 + sex: r.gender,
  199 + terminal: "miniapp",
  200 + sessionKey: sessionKey,
  201 + openid: openid,
  202 + code: e.code,
  203 + isNewPhone: 1,
  204 + store_id: getApp().globalData.setting.stoid,
  205 + };
  206 + } else {
  207 + var dd = {
  208 + oauth: "miniapp",
  209 + nickname: a.clear_word(r.nickName),
  210 + head_pic: r.avatarUrl,
  211 + sex: r.gender,
  212 + terminal: "miniapp",
  213 + sessionKey: sessionKey,
  214 + openid: openid,
  215 + encryptedData: e.encryptedData,
  216 + iv: e.iv,
  217 + store_id: getApp().globalData.setting.stoid,
  218 + };
  219 + }
  220 +
  221 +
  222 + //--如果有邀请人的时候--
  223 + if (th.data.first_leader) {
200 dd.first_leader = th.data.first_leader; 224 dd.first_leader = th.data.first_leader;
201 } 225 }
  226 + //-- 导购会员ID --
  227 + if (getApp().globalData.guide_id) {
  228 + dd.guide_id = getApp().globalData.guide_id;
  229 + }
  230 +
  231 + //门店的扫描识别码
  232 + if (getApp().globalData.store_number) {
  233 + dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim());
  234 + }
  235 +
  236 + console.log("-----会员注册的信息-------");
  237 + console.log(dd);
  238 +
  239 +
  240 + var need_go = 0;
  241 + //如果有需要完善的信息没有完善，就需要跳转
  242 + if (th.data.name_need_go) { need_go = 1; }
  243 + if (th.data.birth_need_go) { need_go = 1; }
  244 + if (th.data.idcard_need_go) { need_go = 1; }
  245 + if (th.data.address_need_go) { need_go = 1; }
  246 + if (th.data.pick_need_go) { need_go = 1; }
  247 + if (th.data.sex_need_go) { need_go = 1; }
  248 + if (th.data.introducer_need_go) { need_go = 1; }
  249 +
  250 + if (need_go) {
  251 +
  252 + if (res2.data.data.is_newphone == 1) {
  253 + var req_data = {
  254 + sessionKey: sessionKey,
  255 + code: e.code,
  256 + isNewPhone: 1,
  257 + store_id: getApp().globalData.setting.stoid,
  258 + }
  259 + }else{
  260 + var req_data = {
  261 + sessionKey: sessionKey,
  262 + encryptedData: e.encryptedData,
  263 + iv: e.iv,
  264 + store_id: getApp().globalData.setting.stoid,
  265 + }
  266 + }
  267 + //-- 获取一下手机 --
  268 + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => {
  269 + if (res.data.code == 0) {
  270 + dd.mobile = res.data.data;
  271 + getApp().globalData.zc_dd = dd;
  272 +
  273 + var g_url="/packageA/pages/profile/profile?is_back=1";
  274 + if(th.data.is_reg){
  275 + g_url+="&is_reg=1";
  276 + }
  277 +
  278 + th.cancle_bind();//关闭
  279 + wx.navigateTo({
  280 + url:g_url
  281 + })
  282 + }
  283 + })
  284 +
  285 + } else {
  286 + if (th.data.is_lable_set) {
  287 + if (res2.data.data.is_newphone == 1) {
  288 + var req_data = {
  289 + sessionKey: sessionKey,
  290 + code: e.code,
  291 + isNewPhone: 1,
  292 + store_id: getApp().globalData.setting.stoid,
  293 + }
  294 + }else{
  295 + var req_data = {
  296 + sessionKey: sessionKey,
  297 + encryptedData: e.encryptedData,
  298 + iv: e.iv,
  299 + store_id: getApp().globalData.setting.stoid,
  300 + }
  301 + }
  302 +
  303 + //-- 获取一下手机 --
  304 + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => {
  305 + if (res.data.code == 0) {
  306 + dd.mobile = res.data.data;
  307 + getApp().globalData.zc_dd = dd;
  308 +
  309 + var g_url="/packageE/pages/user/labels/labels?pageType=1";
  310 + if(th.data.is_reg){
  311 + g_url+="&is_reg=1";
  312 + }
  313 +
  314 + th.cancle_bind();//关闭
  315 + wx.navigateTo({ url: g_url })
  316 + }
  317 + })
  318 + } else {
  319 +
  320 + th.setData({ sub: 0 });
  321 + wx.showLoading({
  322 + title: '处理中.',
  323 + mask: true
  324 + })
  325 + th.zu_ce(dd); //调用注册的函数
  326 + }
  327 + }
  328 +
  329 +
  330 + } else {
  331 + th.setData({ sub: 0 });
  332 + return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
202 } 333 }
203 - })  
204 - }  
205 - //-- 导购会员ID --  
206 - if (getApp().globalData.guide_id) {  
207 - dd.guide_id = getApp().globalData.guide_id;  
208 - } 334 + },
  335 + failStatus: function (t) {
  336 + th.setData({ sub: 0 });
  337 + return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
  338 + },
  339 + fail: function (t) {
  340 + th.setData({ sub: 0 });
  341 + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
  342 + }
  343 + });
  344 + },
  345 +
  346 + zu_ce: function (dd) {
  347 +
209 348
210 - //门店的扫描识别码  
211 - if (getApp().globalData.store_number) {  
212 - dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim()); 349 + if(this.data.sub) return false;
  350 + this.setData({ sub: 1 });
  351 +
  352 + if(getApp().globalData.h5_openid){
  353 + dd.wxopenid=getApp().globalData.h5_openid;
213 } 354 }
214 355
215 - console.log("-----会员注册的信息-------");  
216 - console.log(dd); 356 + var th = this;
217 app.request.get("/api/weshop/users/thirdLogin", { 357 app.request.get("/api/weshop/users/thirdLogin", {
218 data: dd, 358 data: dd,
219 success: function (e) { 359 success: function (e) {
220 360
  361 + wx.hideLoading();
  362 + th.setData({ sub: 0 });
  363 +
221 if (e.data.code == 0) { 364 if (e.data.code == 0) {
  365 + th.cancle_bind();//关闭
222 app.globalData.user_id = e.data.data.user_id; 366 app.globalData.user_id = e.data.data.user_id;
223 - } else { 367 + app.globalData.userInfo = e.data.data;
  368 + }
  369 + else if(e.data.code==-3){
  370 + wx.showModal({
  371 + title: e.data.msg,
  372 + success: function (e) {
  373 + if(e.confirm){
  374 + dd.isreplacemobile=1;
  375 + th.zu_ce(dd);
  376 + }
  377 + }
  378 + });
  379 + return false;
  380 + }
  381 + else {
224 return app.showWarning("授权登入失败！" + e.data.msg); 382 return app.showWarning("授权登入失败！" + e.data.msg);
225 } 383 }
  384 + getApp().globalData.login_back = 1;
  385 + wx.setStorageSync("userinfo", e.data.data);
  386 + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic);
226 387
  388 + //调用接口判断是不是会员
  389 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
  390 + if (res.data.code == 0) {
  391 + getApp().globalData.guide_id = res.data.data.id;
  392 + getApp().globalData.guide_pick_id = res.data.data.pickup_id
  393 + }
  394 + })
227 395
228 - var need_go = 0;  
229 - var t_user = e.data.data; 396 + getApp().showWarning("绑定成功");
230 397
  398 + setTimeout(()=>{
  399 + //-- 看情况,是跳转等级卡，还是跳转到新人有礼 --
  400 + getApp().go_to_page(th.data.is_reg,function (){
231 401
232 - getApp().globalData.login_back = 1;  
233 - wx.setStorageSync("userinfo", e.data.data);  
234 - wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); 402 + })
  403 + },1000)
235 404
236 - //如果有需要完善的信息没有完善，就需要跳转  
237 - if (!t_user['vipname'] && th.data.name_need_go) {  
238 - need_go = 1;  
239 - }  
240 - if (!t_user['birthday'] && th.data.birth_need_go) {  
241 - need_go = 1;  
242 - }  
243 - if (!t_user['idcard'] && th.data.idcard_need_go) {  
244 - need_go = 1;  
245 - }  
246 - if (!t_user['address'] && th.data.address_need_go) {  
247 - need_go = 1;  
248 - }  
249 - if (!t_user['pickup_id'] && th.data.pick_need_go) {  
250 - need_go = 1;  
251 - }  
252 - if (!t_user['sex'] && th.data.sex_need_go) {  
253 - need_go = 1;  
254 - }  
255 - if (!t_user['fromuser_id'] && th.data.introducer_need_go) {  
256 - need_go = 1;  
257 - }  
258 405
259 - if (need_go) {  
260 - getApp().goto("/packageA/pages/profile/profile?is_back=1");  
261 - } else {  
262 - that.cancle_bind();//关闭  
263 - }  
264 406
265 }, 407 },
266 failStatus: function (t) { 408 failStatus: function (t) {
267 - return app.my_warnning("授权登入失败,请稍后再试!", 0, that); 409 + th.setData({ sub: 0 });
  410 + return app.my_warnning("授权登入失败,请稍后再试!", 0, th);
268 }, 411 },
269 fail: function (t) { 412 fail: function (t) {
  413 + th.setData({ sub: 0 });
270 return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; 414 return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
271 } 415 }
272 }); 416 });
273 }, 417 },
274 418
  419 +
  420 +
275 bind_bnerr: function (e) { 421 bind_bnerr: function (e) {
276 var _errImg = e.target.dataset.errorimg; 422 var _errImg = e.target.dataset.errorimg;
277 var _errObj = {}; 423 var _errObj = {};
packageD/components/diy_login/login.wxml
  View file @47c80d7
@@ -61,14 +61,14 @@ @@ -61,14 +61,14 @@
61 61
62 62
63 <view wx:if="{{show_bind}}"> 63 <view wx:if="{{show_bind}}">
64 - <view class="cover-layer" bindtap="close_pop"></view> 64 + <view class="cover-layer" bindtap="close_pop" style="z-index:2222"></view>
65 <view class="p_content"> 65 <view class="p_content">
66 <view class="p_title flex ali-c fs34"> 66 <view class="p_title flex ali-c fs34">
67 登录手机号，同步会员信息以及订单记录 67 登录手机号，同步会员信息以及订单记录
68 </view> 68 </view>
69 <view class="flex btn_view"> 69 <view class="flex btn_view">
70 <view bindtap="close_pop_back" style="height: 100%; line-height:normal;" class="txt-center f2 flex ali-c flex-center2 fs36 b_right">暂不授权</view> 70 <view bindtap="close_pop_back" style="height: 100%; line-height:normal;" class="txt-center f2 flex ali-c flex-center2 fs36 b_right">暂不授权</view>
71 - <button style="height: 100%;" class="g_mobile f2 flex ali-c flex-center2 fs36 txt-red" open-type="getPhoneNumber" bindgetphonenumber="getphone">立即授权</button> 71 + <button disabled="{{sub}}" style="height: 100%;" class="g_mobile f2 flex ali-c flex-center2 fs36 txt-red" open-type="getPhoneNumber" bindgetphonenumber="getphone">立即授权</button>
72 </view> 72 </view>
73 </view> 73 </view>
74 </view> 74 </view>
packageD/components/diy_login/login.wxss
  View file @47c80d7
@@ -49,7 +49,7 @@ button{ @@ -49,7 +49,7 @@ button{
49 top:50%; 49 top:50%;
50 margin-top: -180rpx; 50 margin-top: -180rpx;
51 background-color: #fff; 51 background-color: #fff;
52 - z-index: 12; 52 + z-index: 22222;
53 position: fixed; 53 position: fixed;
54 } 54 }
55 55
packageE/pages/togoin/togoin.js
  View file @47c80d7
@@ -12,7 +12,8 @@ Page({ @@ -12,7 +12,8 @@ Page({
12 first_leader: '', //-- 邀请人 -- 12 first_leader: '', //-- 邀请人 --
13 config2: null, 13 config2: null,
14 sub: 0, 14 sub: 0,
15 - is_reg:1 15 + is_reg:1,
  16 + openid:''
16 }, 17 },
17 onLoad: function (options) { 18 onLoad: function (options) {
18 if (wx.getUserProfile) { 19 if (wx.getUserProfile) {
@@ -22,6 +23,14 @@ Page({ @@ -22,6 +23,14 @@ Page({
22 } 23 }
23 getApp().globalData.isLoad_ad = 1; 24 getApp().globalData.isLoad_ad = 1;
24 25
  26 + if(options.openid){
  27 + this.data.openid=options.openid;
  28 + getApp().globalData.h5_openid=options.openid;
  29 +
  30 + console.log("options.openid")
  31 + console.log(options.openid)
  32 + }
  33 +
25 // if(options.is_reg){ 34 // if(options.is_reg){
26 // this.data.is_reg=1; 35 // this.data.is_reg=1;
27 // } 36 // }
@@ -78,6 +87,20 @@ Page({ @@ -78,6 +87,20 @@ Page({
78 th.setData({ template_id: template_id }); 87 th.setData({ template_id: template_id });
79 } 88 }
80 }) 89 })
  90 +
  91 + setTimeout(()=>{
  92 + if(getApp().globalData.user_id){
  93 + getApp().goto('/pages/user/index/index');
  94 + }else{
  95 + if(!this.data.openid){
  96 + //getApp().goto('/packageH/pages/getopenid/index');
  97 + }
  98 + }
  99 +
  100 + },800)
  101 +
  102 +
  103 +
81 }, 104 },
82 105
83 106
@@ -380,7 +403,7 @@ Page({ @@ -380,7 +403,7 @@ Page({
380 } 403 }
381 }) 404 })
382 } else { 405 } else {
383 - th.setData({ sub: 1 }); 406 + th.setData({ sub: 0 });
384 wx.showLoading({ 407 wx.showLoading({
385 title: '处理中.', 408 title: '处理中.',
386 mask: true 409 mask: true
@@ -406,22 +429,45 @@ Page({ @@ -406,22 +429,45 @@ Page({
406 }); 429 });
407 }, 430 },
408 431
  432 +
  433 +
409 zu_ce: function (dd) { 434 zu_ce: function (dd) {
  435 +
  436 +
  437 + if(this.data.sub) return false;
  438 + this.setData({ sub: 1 });
  439 +
  440 + if(getApp().globalData.h5_openid){
  441 + dd.wxopenid=getApp().globalData.h5_openid;
  442 + }
  443 +
410 var th = this; 444 var th = this;
411 app.request.get("/api/weshop/users/thirdLogin", { 445 app.request.get("/api/weshop/users/thirdLogin", {
412 data: dd, 446 data: dd,
413 success: function (e) { 447 success: function (e) {
  448 +
  449 + wx.hideLoading();
  450 + th.setData({ sub: 0 });
  451 +
414 if (e.data.code == 0) { 452 if (e.data.code == 0) {
415 app.globalData.user_id = e.data.data.user_id; 453 app.globalData.user_id = e.data.data.user_id;
416 - } else {  
417 -  
418 - wx.showToast({  
419 - title: "授权登入失败！" + e.data.msg,  
420 - icon: 'none',  
421 - duration: 2000 454 + app.globalData.userInfo = e.data.data;
  455 + }
  456 + else if(e.data.code==-3){
  457 + wx.showModal({
  458 + title: e.data.msg,
  459 + success: function (e) {
  460 + if(e.confirm){
  461 + dd.isreplacemobile=1;
  462 + th.zu_ce(dd);
  463 + }
  464 + }
422 }); 465 });
423 return false; 466 return false;
424 } 467 }
  468 + else {
  469 + return app.showWarning("授权登入失败！" + e.data.msg);
  470 + }
425 getApp().globalData.login_back = 1; 471 getApp().globalData.login_back = 1;
426 wx.setStorageSync("userinfo", e.data.data); 472 wx.setStorageSync("userinfo", e.data.data);
427 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic); 473 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic);
@@ -440,7 +486,6 @@ Page({ @@ -440,7 +486,6 @@ Page({
440 }) 486 })
441 487
442 488
443 -  
444 }, 489 },
445 failStatus: function (t) { 490 failStatus: function (t) {
446 th.setData({ sub: 0 }); 491 th.setData({ sub: 0 });
@@ -453,7 +498,6 @@ Page({ @@ -453,7 +498,6 @@ Page({
453 }); 498 });
454 }, 499 },
455 500
456 -  
457 bind_bnerr: function (e) { 501 bind_bnerr: function (e) {
458 var _errImg = e.target.dataset.errorimg; 502 var _errImg = e.target.dataset.errorimg;
459 var _errObj = {}; 503 var _errObj = {};
packageE/pages/user/labels/labels.js
  View file @47c80d7
@@ -247,16 +247,38 @@ Page({ @@ -247,16 +247,38 @@ Page({
247 th.setData({ 247 th.setData({
248 is_check: 1 248 is_check: 1
249 }) 249 })
250 - 250 +
  251 + if(getApp().globalData.h5_openid){
  252 + getApp().globalData.zc_dd.openid=getApp().globalData.h5_openid;
  253 + }
  254 +
251 app.request.get("/api/weshop/users/thirdLogin", { 255 app.request.get("/api/weshop/users/thirdLogin", {
252 data: getApp().globalData.zc_dd, 256 data: getApp().globalData.zc_dd,
253 success: function (e) { 257 success: function (e) {
254 wx.hideLoading(); 258 wx.hideLoading();
255 if (e.data.code == 0) { 259 if (e.data.code == 0) {
256 app.globalData.user_id = e.data.data.user_id; 260 app.globalData.user_id = e.data.data.user_id;
257 - } else { 261 + }
  262 + else if(e.data.code==-3){
  263 + th.setData({loading: 0,is_check:0});
  264 + wx.showModal({
  265 + title: e.data.msg,
  266 + success: function (e) {
  267 + if(e.confirm){
  268 + getApp().globalData.zc_dd.isreplacemobile=1;
  269 +
  270 + th.update_label();
  271 + }
  272 + }
  273 + });
  274 + return false;
  275 + }
  276 +
  277 + else {
  278 + th.setData({loading: 0,is_check:0});
258 return app.showWarning("授权登入失败！" + e.data.msg); 279 return app.showWarning("授权登入失败！" + e.data.msg);
259 } 280 }
  281 +
260 getApp().globalData.login_back = 1; 282 getApp().globalData.login_back = 1;
261 wx.setStorageSync("userinfo", e.data.data); 283 wx.setStorageSync("userinfo", e.data.data);
262 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(app.globalData.userInfo.head_pic); 284 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(app.globalData.userInfo.head_pic);
@@ -291,7 +313,10 @@ Page({ @@ -291,7 +313,10 @@ Page({
291 }) 313 })
292 314
293 }, 2000); 315 }, 2000);
294 - } else { 316 + }
  317 +
  318 +
  319 + else {
295 getApp().my_warnning("系统繁忙,请稍后再试", 0, th); 320 getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
296 th.setData({ 321 th.setData({
297 is_check: 0 322 is_check: 0
@@ -429,13 +454,36 @@ Page({ @@ -429,13 +454,36 @@ Page({
429 454
430 this.setData({ is_check: 1 }) 455 this.setData({ is_check: 1 })
431 456
  457 + if(getApp().globalData.h5_openid){
  458 + getApp().globalData.zc_dd.openid=getApp().globalData.h5_openid;
  459 + }
  460 +
432 app.request.get("/api/weshop/users/thirdLogin", { 461 app.request.get("/api/weshop/users/thirdLogin", {
433 data: getApp().globalData.zc_dd, 462 data: getApp().globalData.zc_dd,
434 success: function (e) { 463 success: function (e) {
435 wx.hideLoading(); 464 wx.hideLoading();
  465 + th.setData({loading: 0,is_check:0});
  466 +
436 if (e.data.code == 0) { 467 if (e.data.code == 0) {
437 app.globalData.user_id = e.data.data.user_id; 468 app.globalData.user_id = e.data.data.user_id;
438 - } else { 469 + }
  470 +
  471 + else if(e.data.code==-3){
  472 +
  473 + wx.showModal({
  474 + title: e.data.msg,
  475 + success: function (e) {
  476 + if(e.confirm){
  477 + getApp().globalData.zc_dd.isreplacemobile=1;
  478 +
  479 + th.goto_user();
  480 + }
  481 + }
  482 + });
  483 + return false;
  484 + }
  485 +
  486 + else {
439 return app.showWarning("授权登入失败！" + e.data.msg); 487 return app.showWarning("授权登入失败！" + e.data.msg);
440 } 488 }
441 getApp().globalData.login_back = 1; 489 getApp().globalData.login_back = 1;
packageE/pages/user/user_fw/user_fw.js
  View file @47c80d7
@@ -39,7 +39,7 @@ Page({ @@ -39,7 +39,7 @@ Page({
39 var fw_list=null; 39 var fw_list=null;
40 //--获取列表-- 40 //--获取列表--
41 await getApp().request.promiseGet("/api/weshop/users/grade/wechat/sm/page", { 41 await getApp().request.promiseGet("/api/weshop/users/grade/wechat/sm/page", {
42 - data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id} 42 + data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id,pageSize:100}
43 }).then(res => { 43 }).then(res => {
44 fw_list = res.data.data.pageData; 44 fw_list = res.data.data.pageData;
45 }) 45 })
packageG/pages/user/userqy/userqy.js
  View file @47c80d7
@@ -209,7 +209,7 @@ Page({ @@ -209,7 +209,7 @@ Page({
209 getApp().goto("/packageE/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id); 209 getApp().goto("/packageE/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id);
210 break; 210 break;
211 case "03": 211 case "03":
212 - getApp().goto("/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id); 212 + getApp().goto("/packageH/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id);
213 break; 213 break;
214 case "10": 214 case "10":
215 getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get",{ 215 getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get",{
packageH/pages/goodsInfo/goodsInfo.js
  View file @47c80d7
@@ -228,6 +228,16 @@ Page({ @@ -228,6 +228,16 @@ Page({
228 228
229 //------初始化加载---------- 229 //------初始化加载----------
230 onLoad:async function(t) { 230 onLoad:async function(t) {
  231 +
  232 +
  233 + //主包超包，从主包空文件跳转处理
  234 + if(t.transfer){
  235 + let obj=getApp().globalData.ts_trans_data;
  236 + t= JSON.parse(JSON.stringify(obj));
  237 + getApp().globalData.ts_trans_data=null;
  238 + }
  239 +
  240 +
231 self = this; 241 self = this;
232 242
233 this.setData({ 243 this.setData({
pages/user/user_spsy/user_spsy.js renamed to packageH/pages/user/user_spsy/user_spsy.js
  View file @47c80d7
1 // pages/user/usersy/usersy.js 1 // pages/user/usersy/usersy.js
2 var e = getApp(), 2 var e = getApp(),
3 os = e.globalData.setting; 3 os = e.globalData.setting;
4 -var ut = require('../../../utils/util');  
5 -var regeneratorRuntime = require('../../../utils/runtime.js'); 4 +var ut = require('../../../../utils/util');
  5 +var regeneratorRuntime = require('../../../../utils/runtime.js');
6 6
7 Page({ 7 Page({
8 /** 8 /**
@@ -126,6 +126,7 @@ Page({ @@ -126,6 +126,7 @@ Page({
126 FormId, 126 FormId,
127 storeId: os.stoid, 127 storeId: os.stoid,
128 userId: getApp().globalData.user_id, 128 userId: getApp().globalData.user_id,
  129 + pageSize:100
129 } 130 }
130 const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", { 131 const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", {
131 data: req_data, 132 data: req_data,
pages/user/user_spsy/user_spsy.json renamed to packageH/pages/user/user_spsy/user_spsy.json
  View file @47c80d7
pages/user/user_spsy/user_spsy.wxml renamed to packageH/pages/user/user_spsy/user_spsy.wxml
  View file @47c80d7
pages/user/user_spsy/user_spsy.wxss renamed to packageH/pages/user/user_spsy/user_spsy.wxss
  View file @47c80d7
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @47c80d7
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </block> 8 </block>
9 <block wx:else> 9 <block wx:else>
10 <view class="top_img rel"> 10 <view class="top_img rel">
11 - <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image> 11 + <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=202403'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
12 <lb_sear bindinput_sear="input_sear" bindsearch_lb="search_lb"></lb_sear> 12 <lb_sear bindinput_sear="input_sear" bindsearch_lb="search_lb"></lb_sear>
13 </view> 13 </view>
14 </block> 14 </block>
pages/giftpack/mygiftpack/mygiftpack.wxml
  View file @47c80d7
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 </block> 7 </block>
8 <block wx:else> 8 <block wx:else>
9 <view class="top_img rel"> 9 <view class="top_img rel">
10 - <image mode="widthFix" src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image> 10 + <image mode="widthFix" src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=202403'}}" lazy-load="true"></image>
11 <lb_sear bindinput_sear="input_sear" bindsearch_lb="search_lb"></lb_sear> 11 <lb_sear bindinput_sear="input_sear" bindsearch_lb="search_lb"></lb_sear>
12 </view> 12 </view>
13 </block> 13 </block>
pages/goods/goodsInfo/goodsInfo.js
  View file @47c80d7
@@ -1820,11 +1820,6 @@ Page({ @@ -1820,11 +1820,6 @@ Page({
1820 newd.prom_type = 0; 1820 newd.prom_type = 0;
1821 newd.prom_id = 0; 1821 newd.prom_id = 0;
1822 } 1822 }
1823 -  
1824 -  
1825 -  
1826 - // ut.m_toast('商品详情，购买globalData中导购id:'+getApp().globalData.guide_id );  
1827 -  
1828 //---是不是从收藏夹出来的--- 1823 //---是不是从收藏夹出来的---
1829 if (th.data.c_guide_id) { 1824 if (th.data.c_guide_id) {
1830 newd['guide_id'] = th.data.c_guide_id; 1825 newd['guide_id'] = th.data.c_guide_id;