wxd / MShopWeApp

Commit bfd419896df153b9532d76419180294d44dad2b0

Authored by season
2 parents 9bcee620 72a4209b

解决冲突

Inline Side-by-side
Showing 90 changed files with 522 additions and 1717 deletions
... ... @@ -115,6 +115,14 @@ App({
115 115 } else {
116 116 app.globalData.userInfo = user;
117 117 app.globalData.user_id = user.user_id;
  118 +
  119 + //调用接口判断是不是会员
  120 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => {
  121 + if (res.data.code == 0) {
  122 + getApp().globalData.guide_id = res.data.data.id;
  123 + }
  124 + })
  125 +
118 126 }
119 127 wx.setStorageSync("userinfo", user);
120 128 } else {
... ... @@ -474,6 +482,7 @@ App({
474 482 "/pages/goods/categoryList/categoryList?type=1",
475 483 "/pages/cart/cart/cart", "/pages/user/index/index",
476 484 "/pages/distribution/distribution"];
  485 +
477 486 if (arr_tabbar.indexOf(url) != -1) {
478 487 if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1;
479 488 if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2;
... ... @@ -811,7 +820,7 @@ App({
811 820 let user_info = getApp().globalData.userInfo;
812 821 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
813 822 wx.navigateTo({
814   - url: '/pages/togoin/togoin',
  823 + url: '/packageE/pages/togoin/togoin',
815 824 })
816 825 return false;
817 826 } else {
... ... @@ -1033,17 +1042,31 @@ App({
1033 1042 },
1034 1043  
1035 1044 //获取佣金的比例
1036   - get_commission(first_money,second_money,third_money,th) {
  1045 + get_commission(dis_config,gd_data,goods_num) {
  1046 +
  1047 + var fir_num=0;
  1048 + var sec_num=0;
  1049 + var thi_num=0;
  1050 + if(dis_config.pattern==1){
  1051 + fir_num=(gd_data.fir_rate || 0)*goods_num;
  1052 + sec_num=(gd_data.sec_rate || 0)*goods_num;
  1053 + thi_num=(gd_data.thi_rate || 0)*goods_num;
  1054 + }else{
  1055 + fir_num=parseFloat((gd_data.commission || 0) *goods_num*(dis_config.firstRate || 0)/100).toFixed(2);
  1056 + sec_num=parseFloat((gd_data.commission || 0)*goods_num*(dis_config.secondRate || 0)/100).toFixed(2);
  1057 + thi_num=parseFloat((gd_data.commission || 0)*goods_num*(dis_config.thirdRate || 0)/100).toFixed(2);
  1058 + }
  1059 +
1037 1060 if(getApp().globalData.userInfo.is_distribut){
1038   - var pattern = th.data.dis_config.pattern; // 分销模式
1039   - var first_rate = th.data.dis_config.first_rate; // 一级比例
1040   - var second_rate = th.data.dis_config.second_rate; // 二级比例
1041   - var third_rate = th.data.dis_config.third_rate; // 三级比例
  1061 + var pattern = dis_config.pattern; // 分销模式
  1062 + var first_rate = dis_config.first_rate; // 一级比例
  1063 + var second_rate = dis_config.second_rate; // 二级比例
  1064 + var third_rate = dis_config.third_rate; // 三级比例
1042 1065  
1043 1066 if(this.globalData.userInfo.first_leader){
1044   - return parseFloat(parseFloat(first_money).toFixed(2));
  1067 + return parseFloat(parseFloat(fir_num).toFixed(2));
1045 1068 }else{
1046   - return parseFloat((parseFloat(first_money)+parseFloat(second_money)+parseFloat(third_money)).toFixed(2));
  1069 + return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2));
1047 1070 }
1048 1071 }
1049 1072 },
... ...
app.json
  View file @bfd4198
... ... @@ -24,16 +24,14 @@
24 24 "pages/user/express/express",
25 25 "pages/user/get_user_info/get_user_info",
26 26 "pages/activity/seckill_list/seckill_list",
27   - "pages/activity/pind_list/pind_list",
28   - "pages/togoin/togoin",
  27 + "pages/activity/pind_list/pind_list",
29 28 "pages/team/team_success/team_success",
30 29 "pages/team/team_show/team_show",
31 30 "pages/team/team_ping/team_ping",
32 31 "pages/cart/cart2_pt/cart2_pt",
33 32 "pages/cart/cart_wk/cart_wk",
34 33  
35   -
36   -
  34 +
37 35 "pages/user/userqy/userqy",
38 36 "pages/user/user_spsy/user_spsy",
39 37 "pages/user/user_fw/user_fw",
... ... @@ -206,9 +204,18 @@
206 204 "pages/shop/order_detail/order_detail",
207 205 "pages/error/error"
208 206 ]
  207 + },
  208 + {
  209 + "root": "packageE/",
  210 + "name": "pack5",
  211 + "pages": [
  212 + "pages/togoin/togoin"
  213 + ]
209 214 }
210 215  
211 216 ],
  217 +
  218 +
212 219 "permission": {
213 220 "scope.userLocation": {
214 221 "desc": "获取你的位置信息"
... ...
app.wxss
  View file @bfd4198
... ... @@ -817,6 +817,10 @@ background: #ffe3e2;
817 817 -moz-osx-font-smoothing: grayscale;
818 818 }
819 819  
  820 +.icon-erweima:before {
  821 + content: "\e6bd";
  822 +}
  823 +
820 824 .icon-shangjiantou:before {
821 825 content: "\e791";
822 826 }
... ...
components/diy_service/diy_service.js
  View file @bfd4198
... ... @@ -32,7 +32,7 @@ Component({
32 32  
33 33 //-- 跳到绑定注册会员 --
34 34 go_user:function(){
35   - getApp().goto('/pages/togoin/togoin');
  35 + getApp().goto('/packageE/pages/togoin/togoin');
36 36 return false;
37 37 },
38 38  
... ...
components/diy_store_select/diy_store_select.js
  View file @bfd4198
... ... @@ -105,7 +105,7 @@ Component({
105 105 var user_id=getApp().globalData.user_id;
106 106 if(!user_id){
107 107 wx.navigateTo({
108   - url: '/pages/togoin/togoin',
  108 + url: '/packageE/pages/togoin/togoin',
109 109 });
110 110 return false;
111 111 }
... ...
packageA/pages/activity_share/activity_share.js
  View file @bfd4198
... ... @@ -676,7 +676,7 @@ Page({
676 676 var user_info = getApp().globalData.userInfo;
677 677 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
678 678 //getApp().my_warnning("请先登录",0,this);
679   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  679 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
680 680 return false;
681 681 }
682 682 //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团
... ... @@ -1088,7 +1088,7 @@ Page({
1088 1088 var user_info = getApp().globalData.userInfo;
1089 1089 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1090 1090 //getApp().my_warnning("请先登录",0,this);
1091   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  1091 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
1092 1092 return false;
1093 1093 }
1094 1094  
... ... @@ -1107,7 +1107,7 @@ Page({
1107 1107 var user_info = getApp().globalData.userInfo;
1108 1108 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1109 1109 //getApp().my_warnning("请先登录",0,this);
1110   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  1110 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
1111 1111 return false;
1112 1112 }
1113 1113 var index=e.currentTarget.dataset.index;
... ... @@ -1129,7 +1129,7 @@ Page({
1129 1129 var user_info = getApp().globalData.userInfo;
1130 1130 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1131 1131 //getApp().my_warnning("请先登录",0,this);
1132   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  1132 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
1133 1133 return false;
1134 1134 }
1135 1135  
... ... @@ -1147,7 +1147,7 @@ Page({
1147 1147 var user_info = getApp().globalData.userInfo;
1148 1148 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1149 1149 //getApp().my_warnning("请先登录",0,this);
1150   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  1150 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
1151 1151 return false;
1152 1152 }
1153 1153  
... ...
packageA/pages/checkin/checkin.js
  View file @bfd4198
... ... @@ -33,6 +33,8 @@ Page({
33 33  
34 34 flag: true,
35 35 isLogin: false,
  36 + imgUrl: app.globalData.setting.imghost,
  37 + show_no_integral:false
36 38  
37 39 },
38 40  
... ... @@ -46,11 +48,16 @@ Page({
46 48 });
47 49 self.loadCheckedRecord();
48 50 }else{
49   - wx.showToast({
50   - title: "网络繁忙，请重试",
51   - icon: 'none',
52   - duration: 2000
53   - })
  51 + if(res.data.msg.indexOf('未开启签到')!=-1){
  52 + self.setData({ show_no_integral: true });
  53 + }else{
  54 + wx.showToast({
  55 + title: res.data.msg,
  56 + icon: 'none',
  57 + duration: 2000
  58 + })
  59 + }
  60 +
54 61 }
55 62 },
56 63 });
... ... @@ -126,7 +133,7 @@ Page({
126 133 let user_info = getApp().globalData.userInfo;
127 134 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
128 135 wx.navigateTo({
129   - url: '/pages/togoin/togoin',
  136 + url: '/packageE/pages/togoin/togoin',
130 137 })
131 138 return false;
132 139 } else {
... ... @@ -390,5 +397,10 @@ Page({
390 397 if(url){
391 398 getApp().goto(url);
392 399 }
  400 + },
  401 +
  402 + back_to(){
  403 + wx.navigateBack();
393 404 }
  405 +
394 406 })
... ...
packageA/pages/checkin/checkin.wxml
  View file @bfd4198
... ... @@ -139,4 +139,20 @@
139 139 </view>
140 140 </view>
141 141  
  142 + <view bindtap="back_to" wx:if="{{show_no_integral}}">
  143 + <view class="cover-layer"></view>
  144 + <view class="pop_up_no">
  145 + <view class="title" style="position:relative">
  146 + 提示
  147 + <image class="close_img" src="{{imgUrl}}/miniapp/images/close.png"></image>
  148 + </view>
  149 + <view class="content">
  150 + <image style="width:270rpx; height:270rpx; margin:20rpx 0"
  151 + src="{{imgUrl}}/miniapp/images/fenxiao.png"></image>
  152 + <view style="margin-top:10rpx">商家暂时未开启积分签到，敬请期待哦！ </view>
  153 + </view>
  154 + </view>
  155 + </view>
  156 +
  157 +
142 158 </view>
143 159 \ No newline at end of file
... ...
packageA/pages/checkin/checkin.wxss
  View file @bfd4198
... ... @@ -354,3 +354,44 @@ page,
354 354 flex-wrap: wrap;
355 355 text-align:center;
356 356 }
  357 +
  358 +.cover-layer {
  359 + position: fixed;
  360 + left: 0;
  361 + top: 0;
  362 + right: 0;
  363 + bottom: 0;
  364 + z-index: 1000;
  365 + background: rgba(0,0,0,0.4);
  366 + width: 100%;
  367 + height: 100%;
  368 +}
  369 +
  370 +.pop_up_no{
  371 + z-index: 2000;
  372 + position: fixed;
  373 + width:80%;
  374 + height:500rpx;
  375 + left: 50%;
  376 + top:50%;
  377 + transform:translate(-50%,-50%);
  378 + background-color: #fff;
  379 + font-size: 28rpx;
  380 + border-radius: 20rpx;
  381 +}
  382 +
  383 +.pop_up_no .title{
  384 + height: 90rpx;
  385 + background-color: #ffd601;
  386 + text-align: center;
  387 + line-height: 90rpx;
  388 + border-top-right-radius: 20rpx;
  389 + border-top-left-radius: 20rpx;
  390 +}
  391 +
  392 +.pop_up_no .content{
  393 + text-align: center;
  394 +}
  395 +.pop_up_no .close_img{
  396 + width:60rpx; height:60rpx;position:absolute; right:-15px; top:-15rpx;
  397 + }
357 398 \ No newline at end of file
... ...
packageA/pages/chongzhiDetails/chongzhiDetails.js
  View file @bfd4198
... ... @@ -28,7 +28,7 @@ Page({
28 28  
29 29 var UserInfo=app.globalData.userInfo;
30 30 if(!UserInfo) {
31   - getApp().goto("/pages/togoin/togoin");
  31 + getApp().goto("/packageE/pages/togoin/togoin");
32 32 return false;
33 33 }
34 34  
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @bfd4198
... ... @@ -1328,7 +1328,7 @@ Page({
1328 1328 var user_info = getApp().globalData.userInfo;
1329 1329 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1330 1330 wx.navigateTo({
1331   - url: '/pages/togoin/togoin',
  1331 + url: '/packageE/pages/togoin/togoin',
1332 1332 })
1333 1333 return false;
1334 1334 }
... ... @@ -1870,7 +1870,7 @@ Page({
1870 1870 var user_info = getApp().globalData.userInfo;
1871 1871 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1872 1872 //getApp().my_warnning("请先登录",0,this);
1873   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  1873 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
1874 1874 return false;
1875 1875 }
1876 1876  
... ... @@ -3702,7 +3702,7 @@ Page({
3702 3702 var user_info = getApp().globalData.userInfo;
3703 3703 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
3704 3704 wx.navigateTo({
3705   - url: '/pages/togoin/togoin',
  3705 + url: '/packageE/pages/togoin/togoin',
3706 3706 })
3707 3707 return false;
3708 3708 }
... ... @@ -3739,7 +3739,7 @@ Page({
3739 3739 let user_info = getApp().globalData.userInfo;
3740 3740 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
3741 3741 wx.navigateTo({
3742   - url: '/pages/togoin/togoin',
  3742 + url: '/packageE/pages/togoin/togoin',
3743 3743 })
3744 3744 return false;
3745 3745 };
... ...
packageA/pages/goods_share/goods_share.js
  View file @bfd4198
... ... @@ -115,7 +115,7 @@ Page({
115 115 })
116 116  
117 117 if(!app.globalData.userInfo) {
118   - getApp().goto("/pages/togoin/togoin");
  118 + getApp().goto("/packageE/pages/togoin/togoin");
119 119 }
120 120  
121 121  
... ... @@ -371,7 +371,7 @@ Page({
371 371 var user_info = getApp().globalData.userInfo;
372 372 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
373 373 //getApp().my_warnning("请先登录",0,this);
374   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  374 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
375 375 return false;
376 376 }
377 377 //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团
... ... @@ -752,7 +752,7 @@ Page({
752 752 var user_info = getApp().globalData.userInfo;
753 753 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
754 754 //getApp().my_warnning("请先登录",0,this);
755   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  755 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
756 756 return false;
757 757 }
758 758  
... ...
packageA/pages/hongBao/hongBao.js
  View file @bfd4198
... ... @@ -54,7 +54,7 @@ Page({
54 54 let user_info = app.globalData.userInfo;
55 55 if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
56 56 wx.navigateTo({
57   - url: '/pages/togoin/togoin',
  57 + url: '/packageE/pages/togoin/togoin',
58 58 })
59 59 } else {
60 60 resolve();
... ...
packageA/pages/hongBaoDetails/hongBaoDetails.js
  View file @bfd4198
... ... @@ -108,7 +108,7 @@ Page({
108 108 let user_info = app.globalData.userInfo;
109 109 if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
110 110 wx.navigateTo({
111   - url: '/pages/togoin/togoin',
  111 + url: '/packageE/pages/togoin/togoin',
112 112 })
113 113 } else {
114 114 resolve();
... ...
packageA/pages/liveStreamDetails/liveStreamDetails.js
  View file @bfd4198
... ... @@ -56,7 +56,7 @@ Page({
56 56 clickShare: function () {
57 57  
58 58 if(!getApp().globalData.user_id){
59   - getApp().goto("/pages/togoin/togoin");
  59 + getApp().goto("/packageE/pages/togoin/togoin");
60 60 return false;
61 61 }
62 62 this.setData({
... ...
packageA/pages/live_share/live_share.js
  View file @bfd4198
... ... @@ -169,7 +169,7 @@ Page({
169 169 var user_info = getApp().globalData.userInfo;
170 170 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
171 171 //getApp().my_warnning("请先登录",0,this);
172   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  172 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
173 173 return false;
174 174 }
175 175  
... ...
packageA/pages/my_service2/appment_main.js
  View file @bfd4198
... ... @@ -548,7 +548,7 @@ Page({
548 548 var user_info = getApp().globalData.userInfo;
549 549 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
550 550 wx.navigateTo({
551   - url: '/pages/togoin/togoin',
  551 + url: '/packageE/pages/togoin/togoin',
552 552 })
553 553 return false;
554 554 }
... ...
packageA/pages/prom_list/prom_list.js
  View file @bfd4198
... ... @@ -662,7 +662,7 @@ Page({
662 662 var user_info = getApp().globalData.userInfo;
663 663 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
664 664 wx.navigateTo({
665   - url: '/pages/togoin/togoin',
  665 + url: '/packageE/pages/togoin/togoin',
666 666 })
667 667 return false;
668 668 }
... ...
packageA/pages/quan/quan.js
  View file @bfd4198
... ... @@ -132,7 +132,7 @@ Page({
132 132 var user_info = getApp().globalData.userInfo;
133 133 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
134 134 //getApp().my_warnning("请先登录",0,this);
135   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  135 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
136 136 return false;
137 137 }
138 138  
... ... @@ -155,7 +155,7 @@ Page({
155 155 var user_info = getApp().globalData.userInfo;
156 156 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
157 157 //getApp().my_warnning("请先登录",0,this);
158   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  158 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
159 159 return false;
160 160 }
161 161  
... ...
packageA/pages/quan_list/quan_list.js
  View file @bfd4198
... ... @@ -98,7 +98,7 @@ Page({
98 98 var user_info = getApp().globalData.userInfo;
99 99 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
100 100 wx.navigateTo({
101   - url: '/pages/togoin/togoin',
  101 + url: '/packageE/pages/togoin/togoin',
102 102 })
103 103 return false;
104 104 }
... ...
packageA/pages/quan_pro/quan_pro.js
  View file @bfd4198
... ... @@ -82,7 +82,7 @@ Page({
82 82 var user_info = getApp().globalData.userInfo;
83 83 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
84 84 wx.navigateTo({
85   - url: '/pages/togoin/togoin',
  85 + url: '/packageE/pages/togoin/togoin',
86 86 })
87 87 return false;
88 88 }
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
  View file @bfd4198
... ... @@ -1216,7 +1216,7 @@ Page({
1216 1216 var user_info = getApp().globalData.userInfo;
1217 1217 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1218 1218 wx.navigateTo({
1219   - url: '/pages/togoin/togoin',
  1219 + url: '/packageE/pages/togoin/togoin',
1220 1220 })
1221 1221 return false;
1222 1222 }
... ... @@ -1742,7 +1742,7 @@ Page({
1742 1742 var user_info = getApp().globalData.userInfo;
1743 1743 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1744 1744 //getApp().my_warnning("请先登录",0,this);
1745   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  1745 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
1746 1746 return false;
1747 1747 }
1748 1748  
... ... @@ -3568,7 +3568,7 @@ Page({
3568 3568 var user_info = getApp().globalData.userInfo;
3569 3569 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
3570 3570 wx.navigateTo({
3571   - url: '/pages/togoin/togoin',
  3571 + url: '/packageE/pages/togoin/togoin',
3572 3572 })
3573 3573 return false;
3574 3574 }
... ... @@ -3606,7 +3606,7 @@ Page({
3606 3606 let user_info = getApp().globalData.userInfo;
3607 3607 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
3608 3608 wx.navigateTo({
3609   - url: '/pages/togoin/togoin',
  3609 + url: '/packageE/pages/togoin/togoin',
3610 3610 })
3611 3611 return false;
3612 3612 };
... ... @@ -4175,7 +4175,7 @@ Page({
4175 4175 var user_info = getApp().globalData.userInfo;
4176 4176 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
4177 4177 wx.navigateTo({
4178   - url: '/pages/togoin/togoin',
  4178 + url: '/packageE/pages/togoin/togoin',
4179 4179 })
4180 4180 return false;
4181 4181 }
... ...
packageA/pages/serviceCard_pd/team_show/team_show.js
  View file @bfd4198
... ... @@ -162,7 +162,7 @@ Page({
162 162 //--先判断会员状态--
163 163 var user_info=getApp().globalData.userInfo;
164 164 if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){
165   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  165 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
166 166 return false;
167 167 }
168 168  
... ...
packageA/pages/serviceCard_pd/team_success/team_success.js
  View file @bfd4198
... ... @@ -854,7 +854,7 @@ Page({
854 854  
855 855 clickShare() {
856 856 if(!getApp().globalData.user_id){
857   - getApp().goto("/pages/togoin/togoin");
  857 + getApp().goto("/packageE/pages/togoin/togoin");
858 858 return false;
859 859 }
860 860 this.setData({
... ...
packageA/pages/service_record/service_record.js
  View file @bfd4198
... ... @@ -57,7 +57,7 @@ Page({
57 57 let user_info = app.globalData.userInfo;
58 58 if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
59 59 wx.navigateTo({
60   - url: '/pages/togoin/togoin',
  60 + url: '/packageE/pages/togoin/togoin',
61 61 })
62 62 } else {
63 63 resolve();
... ...
packageA/pages/service_share/service_share.js
  View file @bfd4198
... ... @@ -344,7 +344,7 @@ Page({
344 344 var user_info = getApp().globalData.userInfo;
345 345 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
346 346 //getApp().my_warnning("请先登录",0,this);
347   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  347 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
348 348 return false;
349 349 }
350 350 //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团
... ... @@ -731,7 +731,7 @@ Page({
731 731 var user_info = getApp().globalData.userInfo;
732 732 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
733 733 //getApp().my_warnning("请先登录",0,this);
734   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  734 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
735 735 return false;
736 736 }
737 737  
... ...
packageB/pages/boxes-list/boxes-list.js
  View file @bfd4198
... ... @@ -109,7 +109,7 @@ Page({
109 109 let user_info = getApp().globalData.userInfo;
110 110 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
111 111 wx.navigateTo({
112   - url: '/pages/togoin/togoin',
  112 + url: '/packageE/pages/togoin/togoin',
113 113 })
114 114 return false;
115 115 };
... ...
packageB/pages/evaluate/evaluate.js
  View file @bfd4198
... ... @@ -249,7 +249,7 @@ Page({
249 249  
250 250  
251 251 if(!userinfo){
252   - getApp().goto("/pages/togoin/togoin");
  252 + getApp().goto("/packageE/pages/togoin/togoin");
253 253 }
254 254  
255 255  
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.js
  View file @bfd4198
... ... @@ -1161,8 +1161,7 @@ Page({
1161 1161 // 'list.pageData': this.data.record,
1162 1162 // // record: self.data.list.pageData,
1163 1163 // });
1164   -
1165   -
  1164 +
1166 1165 },
1167 1166  
1168 1167 closePopup() {
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
  View file @bfd4198
... ... @@ -187,7 +187,6 @@
187 187 </view>
188 188 </view>
189 189  
190   -
191 190 <!-- 海报 -->
192 191 <view class="poster-container" wx:if="{{showPoster}}">
193 192 <view class="t-r pdb20 white2"><text class="iconfont icon-close fs40" bindtap="closePoster"></text></view>
... ...
packageB/pages/zuhegou/index/index.js
  View file @bfd4198
... ... @@ -369,7 +369,7 @@ Page({
369 369 })
370 370  
371 371 } else {
372   - getApp().goto("/pages/togoin/togoin");
  372 + getApp().goto("/packageE/pages/togoin/togoin");
373 373 return false;
374 374 }
375 375 })
... ... @@ -521,7 +521,7 @@ Page({
521 521 var index = e.currentTarget.dataset.index;
522 522 var userInfo = getApp().globalData.userInfo;
523 523 if (!userInfo) {
524   - getApp().goto("/pages/togoin/togoin");
  524 + getApp().goto("/packageE/pages/togoin/togoin");
525 525 return false;
526 526 }
527 527 let haveAdded = this.data.list[index].haveAdded;
... ... @@ -656,7 +656,7 @@ Page({
656 656 var th = this;
657 657 var userInfo = getApp().globalData.userInfo;
658 658 if (!userInfo) {
659   - getApp().goto("/pages/togoin/togoin");
  659 + getApp().goto("/packageE/pages/togoin/togoin");
660 660 return false;
661 661 }
662 662  
... ... @@ -679,7 +679,7 @@ Page({
679 679 sub(e) {
680 680 var userInfo = getApp().globalData.userInfo;
681 681 if (!userInfo) {
682   - getApp().goto("/pages/togoin/togoin");
  682 + getApp().goto("/packageE/pages/togoin/togoin");
683 683 return false;
684 684 }
685 685  
... ... @@ -784,7 +784,7 @@ Page({
784 784 var th = this;
785 785 var userInfo = getApp().globalData.userInfo;
786 786 if (!userInfo) {
787   - getApp().goto("/pages/togoin/togoin");
  787 + getApp().goto("/packageE/pages/togoin/togoin");
788 788 return false;
789 789 }
790 790 wx.showLoading();
... ... @@ -1694,7 +1694,7 @@ Page({
1694 1694 user_id = getApp().globalData.user_id;
1695 1695  
1696 1696 if (user_id == null) {
1697   - getApp().goto("/pages/togoin/togoin");
  1697 + getApp().goto("/packageE/pages/togoin/togoin");
1698 1698 return false;
1699 1699 }
1700 1700 if (map && map.has(gd.goods_id)) {
... ... @@ -1792,7 +1792,7 @@ Page({
1792 1792 choose_store: function (e) {
1793 1793 var userInfo = getApp().globalData.userInfo;
1794 1794 if (!userInfo) {
1795   - getApp().goto("/pages/togoin/togoin");
  1795 + getApp().goto("/packageE/pages/togoin/togoin");
1796 1796 return false;
1797 1797 }
1798 1798 this.data.only = 1;
... ...
packageB/pages/zuhegou/preindex/index.js
  View file @bfd4198
... ... @@ -370,7 +370,7 @@ Page({
370 370 })
371 371  
372 372 } else {
373   - getApp().goto("/pages/togoin/togoin");
  373 + getApp().goto("/packageE/pages/togoin/togoin");
374 374 return false;
375 375 }
376 376 })
... ... @@ -523,7 +523,7 @@ Page({
523 523 var index = e.currentTarget.dataset.index;
524 524 var userInfo = getApp().globalData.userInfo;
525 525 if (!userInfo) {
526   - getApp().goto("/pages/togoin/togoin");
  526 + getApp().goto("/packageE/pages/togoin/togoin");
527 527 return false;
528 528 }
529 529 let haveAdded = this.data.list[index].haveAdded;
... ... @@ -658,7 +658,7 @@ Page({
658 658 var th = this;
659 659 var userInfo = getApp().globalData.userInfo;
660 660 if (!userInfo) {
661   - getApp().goto("/pages/togoin/togoin");
  661 + getApp().goto("/packageE/pages/togoin/togoin");
662 662 return false;
663 663 }
664 664  
... ... @@ -681,7 +681,7 @@ Page({
681 681 sub(e) {
682 682 var userInfo = getApp().globalData.userInfo;
683 683 if (!userInfo) {
684   - getApp().goto("/pages/togoin/togoin");
  684 + getApp().goto("/packageE/pages/togoin/togoin");
685 685 return false;
686 686 }
687 687  
... ... @@ -786,7 +786,7 @@ Page({
786 786 var th = this;
787 787 var userInfo = getApp().globalData.userInfo;
788 788 if (!userInfo) {
789   - getApp().goto("/pages/togoin/togoin");
  789 + getApp().goto("/packageE/pages/togoin/togoin");
790 790 return false;
791 791 }
792 792 wx.showLoading();
... ... @@ -1695,7 +1695,7 @@ Page({
1695 1695 user_id = getApp().globalData.user_id;
1696 1696  
1697 1697 if (user_id == null) {
1698   - getApp().goto("/pages/togoin/togoin");
  1698 + getApp().goto("/packageE/pages/togoin/togoin");
1699 1699 return false;
1700 1700 }
1701 1701 if (map && map.has(gd.goods_id)) {
... ... @@ -1793,7 +1793,7 @@ Page({
1793 1793 choose_store: function (e) {
1794 1794 var userInfo = getApp().globalData.userInfo;
1795 1795 if (!userInfo) {
1796   - getApp().goto("/pages/togoin/togoin");
  1796 + getApp().goto("/packageE/pages/togoin/togoin");
1797 1797 return false;
1798 1798 }
1799 1799 this.data.only = 1;
... ...
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
  View file @bfd4198
... ... @@ -447,7 +447,7 @@ Page({
447 447 var user_info = getApp().globalData.userInfo;
448 448 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
449 449 //getApp().my_warnning("请先登录",0,this);
450   - // wx.navigateTo({ url: '/pages/togoin/togoin', })
  450 + // wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
451 451 // return false;
452 452 }
453 453  
... ... @@ -1011,7 +1011,7 @@ Page({
1011 1011  
1012 1012 clickShare() {
1013 1013 if(!getApp().globalData.user_id){
1014   - getApp().goto("/pages/togoin/togoin");
  1014 + getApp().goto("/packageE/pages/togoin/togoin");
1015 1015 return false;
1016 1016 }
1017 1017 this.setData({
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @bfd4198
... ... @@ -540,7 +540,7 @@ Page({
540 540  
541 541 getApp().is_Single_page(th, function () {
542 542 wx.navigateTo({
543   - url: '/pages/togoin/togoin',
  543 + url: '/packageE/pages/togoin/togoin',
544 544 })
545 545 return false;
546 546 })
... ... @@ -2064,7 +2064,7 @@ Page({
2064 2064 var user_info = getApp().globalData.userInfo;
2065 2065 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2066 2066 wx.navigateTo({
2067   - url: '/pages/togoin/togoin',
  2067 + url: '/packageE/pages/togoin/togoin',
2068 2068 })
2069 2069 return false;
2070 2070 }
... ... @@ -3917,7 +3917,7 @@ Page({
3917 3917 var user_info = getApp().globalData.userInfo;
3918 3918 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
3919 3919 wx.navigateTo({
3920   - url: '/pages/togoin/togoin',
  3920 + url: '/packageE/pages/togoin/togoin',
3921 3921 })
3922 3922 return false;
3923 3923 };
... ... @@ -4491,7 +4491,7 @@ Page({
4491 4491 var user_info = getApp().globalData.userInfo;
4492 4492 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
4493 4493 wx.navigateTo({
4494   - url: '/pages/togoin/togoin',
  4494 + url: '/packageE/pages/togoin/togoin',
4495 4495 })
4496 4496 return false;
4497 4497 }
... ... @@ -4643,7 +4643,7 @@ Page({
4643 4643 var user_info = getApp().globalData.userInfo;
4644 4644 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
4645 4645 //getApp().my_warnning("请先登录",0,this);
4646   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  4646 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
4647 4647 return false;
4648 4648 }
4649 4649  
... ... @@ -6224,7 +6224,7 @@ Page({
6224 6224  
6225 6225 clickShare() {
6226 6226 if(!getApp().globalData.user_id){
6227   - getApp().goto("/pages/togoin/togoin");
  6227 + getApp().goto("/packageE/pages/togoin/togoin");
6228 6228 return false;
6229 6229 }
6230 6230 this.setData({
... ... @@ -6533,7 +6533,7 @@ Page({
6533 6533 let user_info = getApp().globalData.userInfo;
6534 6534 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
6535 6535 wx.navigateTo({
6536   - url: '/pages/togoin/togoin',
  6536 + url: '/packageE/pages/togoin/togoin',
6537 6537 })
6538 6538 return false;
6539 6539 };
... ...
packageC/pages/presell/cart/cart.js
  View file @bfd4198
... ... @@ -136,7 +136,7 @@ Page({
136 136 }
137 137 });
138 138 if (!getApp().globalData.userInfo) {
139   - getApp().goto("/pages/togoin/togoin");
  139 + getApp().goto("/packageE/pages/togoin/togoin");
140 140 }
141 141  
142 142 //判断是不是佣金抵扣
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @bfd4198
... ... @@ -1260,7 +1260,7 @@ Page({
1260 1260 var user_info = getApp().globalData.userInfo;
1261 1261 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1262 1262 wx.navigateTo({
1263   - url: '/pages/togoin/togoin',
  1263 + url: '/packageE/pages/togoin/togoin',
1264 1264 })
1265 1265 return false;
1266 1266 }
... ... @@ -2656,7 +2656,7 @@ Page({
2656 2656 var user_info = getApp().globalData.userInfo;
2657 2657 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2658 2658 wx.navigateTo({
2659   - url: '/pages/togoin/togoin',
  2659 + url: '/packageE/pages/togoin/togoin',
2660 2660 })
2661 2661 return false;
2662 2662 }
... ... @@ -2719,7 +2719,7 @@ Page({
2719 2719 var user_info = getApp().globalData.userInfo;
2720 2720 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2721 2721 //getApp().my_warnning("请先登录",0,this);
2722   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  2722 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
2723 2723 return false;
2724 2724 }
2725 2725  
... ... @@ -3873,7 +3873,7 @@ Page({
3873 3873  
3874 3874 clickShare() {
3875 3875 if(!getApp().globalData.user_id){
3876   - getApp().goto("/pages/togoin/togoin");
  3876 + getApp().goto("/packageE/pages/togoin/togoin");
3877 3877 return false;
3878 3878 }
3879 3879 this.setData({ share_hidden: true, });
... ... @@ -4076,7 +4076,7 @@ Page({
4076 4076 let user_info = getApp().globalData.userInfo;
4077 4077 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
4078 4078 wx.navigateTo({
4079   - url: '/pages/togoin/togoin',
  4079 + url: '/packageE/pages/togoin/togoin',
4080 4080 })
4081 4081 return false;
4082 4082 };
... ...
packageC/pages/presell/list/list.js
  View file @bfd4198
... ... @@ -56,7 +56,7 @@ Page({
56 56 //调用列表
57 57 this.get_list();
58 58 }else{
59   - getApp().goto("/pages/togoin/togoin");
  59 + getApp().goto("/packageE/pages/togoin/togoin");
60 60 }
61 61  
62 62 var room_id = t.room_id;
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.js
  View file @bfd4198
... ... @@ -1254,7 +1254,7 @@ Page({
1254 1254 var user_info = getApp().globalData.userInfo;
1255 1255 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1256 1256 wx.navigateTo({
1257   - url: '/pages/togoin/togoin',
  1257 + url: '/packageE/pages/togoin/togoin',
1258 1258 })
1259 1259 return false;
1260 1260 }
... ... @@ -2619,7 +2619,7 @@ Page({
2619 2619 var user_info = getApp().globalData.userInfo;
2620 2620 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2621 2621 wx.navigateTo({
2622   - url: '/pages/togoin/togoin',
  2622 + url: '/packageE/pages/togoin/togoin',
2623 2623 })
2624 2624 return false;
2625 2625 }
... ... @@ -2682,7 +2682,7 @@ Page({
2682 2682 var user_info = getApp().globalData.userInfo;
2683 2683 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2684 2684 //getApp().my_warnning("请先登录",0,this);
2685   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  2685 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
2686 2686 return false;
2687 2687 }
2688 2688  
... ... @@ -3837,7 +3837,7 @@ Page({
3837 3837  
3838 3838 clickShare() {
3839 3839 if(!getApp().globalData.user_id){
3840   - getApp().goto("/pages/togoin/togoin");
  3840 + getApp().goto("/packageE/pages/togoin/togoin");
3841 3841 return false;
3842 3842 }
3843 3843 this.setData({ share_hidden: true, });
... ...
packageD/pages/AI-test-skin/index/aiskin.js
  View file @bfd4198
... ... @@ -33,7 +33,7 @@ Page({
33 33 let user_id=getApp().globalData.user_id;
34 34 if(!user_id) {
35 35 setTimeout(function () {
36   - let url = "/pages/togoin/togoin";
  36 + let url = "/packageE/pages/togoin/togoin";
37 37 app.goto(url);
38 38 }, 1000)
39 39 }
... ... @@ -86,7 +86,7 @@ Page({
86 86 });
87 87  
88 88 setTimeout(function () {
89   - let url = "/pages/togoin/togoin";
  89 + let url = "/packageE/pages/togoin/togoin";
90 90 app.goto(url);
91 91 }, 1000)
92 92 return false;
... ...
packageD/pages/AI-test-skin/success_result/success_result.js
  View file @bfd4198
... ... @@ -845,7 +845,7 @@ Page({
845 845 //--先判断会员状态--
846 846 var user_info = getApp().globalData.userInfo;
847 847 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
848   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  848 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
849 849 return false;
850 850 }
851 851 if (this.data.share_hidden) {
... ... @@ -1140,7 +1140,7 @@ Page({
1140 1140 var user_info = getApp().globalData.userInfo;
1141 1141 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1142 1142 wx.navigateTo({
1143   - url: '/pages/togoin/togoin',
  1143 + url: '/packageE/pages/togoin/togoin',
1144 1144 })
1145 1145 return false;
1146 1146 }
... ...
packageD/pages/user/coupons/coupons.js
  View file @bfd4198
... ... @@ -42,16 +42,23 @@ Page({
42 42 by_list:[],
43 43 isloading:0,
44 44 pageNum: 1,
  45 + currentIndex:0
45 46 },
46 47 /**
47 48 * 生命周期函数--监听页面加载
48 49 */
49 50 onLoad: function (options) {
50   - _this = this;
51   - this.setData({
52   - details: []
53   - });
54   - this.wjquery();
  51 + _this = this;
  52 + // this.setData({
  53 + // details: []
  54 + // });
  55 + // this.wjquery();
  56 + if(options.index){
  57 + this.setData({currentIndex:options.index});
  58 + }
  59 +
  60 +
  61 +
55 62 },
56 63 /**
57 64 * 生命周期函数--监听页面显示
... ... @@ -68,18 +75,26 @@ Page({
68 75 * by sty
69 76 */
70 77 getApp().getConfig2(function (ee) {
71   - var json_d = JSON.parse(ee.switch_list);
  78 + var json_d = JSON.parse(ee.switch_list);
72 79 let is_show_dhwz = json_d.dhwz_switch;
73 80 let grades = th.data.grades;
74 81 // console.log('is_show_dhwz----------------------------',is_show_dhwz);
75   - if(is_show_dhwz) {
76   - if(grades.indexOf('微券兑换') == -1) {
  82 + if (is_show_dhwz) {
  83 + if (grades.indexOf('微券兑换') == -1) {
77 84 grades.push('微券兑换');
78   - th.setData({ grades });
79   - };
80   - };
81   - th.setData({ is_show_dhwz });
  85 + th.setData({grades});
  86 + }
  87 +
  88 + }
  89 +
  90 + th.setData({is_show_dhwz});
  91 + th.init_data(th.data.currentIndex);
  92 +
82 93 },1);
  94 +
  95 +
  96 +
  97 +
83 98 },
84 99  
85 100  
... ... @@ -155,6 +170,30 @@ Page({
155 170 this.wjquery();
156 171 };
157 172 },
  173 +
  174 + init_data(idx){
  175 +
  176 + var name=this.data.grades[idx];
  177 + this.setData({
  178 + is_get: 0,
  179 + pageNum: 1,
  180 + grade_name: name,
  181 + currentIndex: idx,
  182 + is_no_more: 0,
  183 + current_page: 1,
  184 + noMore: false,
  185 + details: [],
  186 + by_list: [],
  187 + showQr: false,
  188 + });
  189 +
  190 + if(idx == 3) {//微券兑换
  191 + this.exchange();
  192 + } else {//其他
  193 + this.wjquery();
  194 + };
  195 + },
  196 +
158 197  
159 198 /**
160 199 * 点击"立即使用"
... ...
packageD/pages/user/deposit/deposit.js
  View file @bfd4198
... ... @@ -28,7 +28,7 @@ Page({
28 28 // --先判断会员状态--
29 29 var user_info = getApp().globalData.userInfo;
30 30 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
31   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  31 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
32 32 return false;
33 33 }
34 34 wx.setNavigationBarTitle({
... ...
packageD/pages/user/deposit/prepaid/prepaid.js
  View file @bfd4198
... ... @@ -35,7 +35,7 @@ Page({
35 35 else{
36 36 wx.showToast({ title: "您还未登陆，请先授权", icon: 'none', duration: 2000 })
37 37 setTimeout(function () {
38   - getApp().goto("/pages/togoin/togoin");
  38 + getApp().goto("/packageE/pages/togoin/togoin");
39 39 },1200)
40 40 }
41 41  
... ...
packageD/pages/user/integral/integral.js
  View file @bfd4198
... ... @@ -311,7 +311,7 @@ Page({
311 311 //--先判断会员状态--
312 312 var user_info = getApp().globalData.userInfo;
313 313 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
314   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  314 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
315 315 return false;
316 316 }
317 317  
... ...
packageD/pages/user/member/bring/bring.js
  View file @bfd4198
... ... @@ -337,7 +337,7 @@ Page({
337 337 var user_info = getApp().globalData.userInfo;
338 338 if (user_info == null || user_info.mobile == undefined || user_info.mobile == " " || user_info.mobile == null) {
339 339 wx.navigateTo({
340   - url: '/pages/togoin/togoin',
  340 + url: '/packageE/pages/togoin/togoin',
341 341 })
342 342 return false;
343 343 }
... ...
packageD/pages/user/member/menber.js
  View file @bfd4198
... ... @@ -25,7 +25,7 @@ Page({
25 25 //--先判断会员状态--
26 26 var user_info = getApp().globalData.userInfo;
27 27 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
28   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  28 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
29 29 return false;
30 30 }
31 31 this.init_fir();
... ...
pages/togoin/togoin.js renamed to packageE/pages/togoin/togoin.js
  View file @bfd4198
1   -var t = require("../../utils/common.js");
  1 +var t = require("../../../utils/common.js");
2 2 const app=getApp();
3 3 var os = app.globalData.setting;
4   -var regeneratorRuntime = require('../../utils/runtime.js');
  4 +var regeneratorRuntime = require('../../../utils/runtime.js');
5 5  
6 6 Page({
7 7 data: {
... ... @@ -19,7 +19,6 @@ Page({
19 19 canIUseGetUserProfile: true
20 20 })
21 21 }
22   -
23 22 getApp().globalData.isLoad_ad=1;
24 23 //--判断是否有接受到邀请人的ID--
25 24 if(options.first_leader){
... ... @@ -122,6 +121,14 @@ Page({
122 121 //把会员的信息存在内存
123 122 wx.setStorageSync("userinfo",e.data.data);
124 123  
  124 + //调用接口判断是不是会员
  125 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
  126 + if (res.data.code == 0) {
  127 + getApp().globalData.guide_id = res.data.data.id;
  128 + }
  129 + })
  130 +
  131 +
125 132 setTimeout(function () {
126 133 getApp().globalData.login_back=1;
127 134 wx.navigateBack({ delta: 1}) //返回上一页
... ... @@ -258,7 +265,15 @@ Page({
258 265 getApp().globalData.login_back=1;
259 266 wx.setStorageSync("userinfo",e.data.data);
260 267 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic);
261   - wx.navigateBack({ delta: 1})
  268 +
  269 + //调用接口判断是不是会员
  270 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
  271 + if (res.data.code == 0) {
  272 + getApp().globalData.guide_id = res.data.data.id;
  273 + }
  274 + })
  275 +
  276 + wx.navigateBack({ delta: 1})
262 277  
263 278 },
264 279 failStatus: function (t) {
... ... @@ -321,6 +336,14 @@ Page({
321 336 //把会员的信息存在内存
322 337 wx.setStorageSync("userinfo",e.data.data);
323 338  
  339 + //调用接口判断是不是会员
  340 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
  341 + if (res.data.code == 0) {
  342 + getApp().globalData.guide_id = res.data.data.id;
  343 + }
  344 + })
  345 +
  346 +
324 347 setTimeout(function () {
325 348 getApp().globalData.login_back=1;
326 349 wx.navigateBack({ delta: 1}) //返回上一页
... ...
pages/togoin/togoin.json renamed to packageE/pages/togoin/togoin.json
  View file @bfd4198
pages/togoin/togoin.wxml renamed to packageE/pages/togoin/togoin.wxml
  View file @bfd4198
pages/togoin/togoin.wxss renamed to packageE/pages/togoin/togoin.wxss
  View file @bfd4198
pages/cart/cart/cart.js
  View file @bfd4198
... ... @@ -50,13 +50,7 @@ Page({
50 50 onLoad: function () {
51 51 var a = this,
52 52 ee = a;
53   - //----获取系统参数-----
54   - // getApp().getConfig2(function (e) {
55   - // ee.setData({
56   - // bconfig: e,
57   - // sales_rules: e.sales_rules
58   - // });
59   - // })
  53 +
60 54  
61 55 wx.setNavigationBarTitle({
62 56 title: "购物车",
... ... @@ -122,7 +116,7 @@ Page({
122 116 enabled: 1
123 117 }
124 118 }).then(res => {
125   - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
  119 + if( ut.ajax_ok(res)){
126 120 var a = res.data.data.pageData;
127 121 var narr=[];
128 122 for(var i in a){
... ... @@ -150,7 +144,7 @@ Page({
150 144 getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
151 145 data: req_d,
152 146 }).then(res => {
153   - if (res.data.code == 0 && res.data.data && res.data.data.pageData.length > 0) {
  147 + if (ut.ajax_ok(res)) {
154 148 th.setData({
155 149 is_has_flash: 1
156 150 })
... ... @@ -269,7 +263,7 @@ Page({
269 263  
270 264 },
271 265 }).then(res => {
272   - if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  266 + if(ut.ajax_ok2(res)) {
273 267 by_map = {};
274 268 for (let i in res.data.data) {
275 269 let item = res.data.data[i];
... ...
pages/cart/cart2/cart2.js
  View file @bfd4198
... ... @@ -1267,19 +1267,8 @@ Page({
1267 1267 //-- 计算获得佣金的金额 --
1268 1268 if( getApp().globalData.userInfo.is_distribut
1269 1269 && th.data.dis_config && th.data.dis_config.is_yongjin_dk){
1270   - var fir_num=0;
1271   - var sec_num=0;
1272   - var thi_num=0;
1273   - if(th.data.dis_config.pattern==1){
1274   - fir_num=(t.data.data.fir_rate || 0)*gg.goods_num;
1275   - sec_num=(t.data.data.sec_rate || 0)*gg.goods_num;
1276   - thi_num=(t.data.data.thi_rate || 0)*gg.goods_num;
1277   - }else{
1278   - fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2);
1279   - sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2);
1280   - thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2);
1281   - }
1282   - var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th);
  1270 +
  1271 + var c_num=getApp().get_commission(th.data.dis_config,t.data.data,gg.goods_num);
1283 1272  
1284 1273 gd.use_commission=c_num;
1285 1274 t.data.data.use_commission=c_num;
... ... @@ -1327,19 +1316,8 @@ Page({
1327 1316 //-- 计算获得佣金的金额 --
1328 1317 if( getApp().globalData.userInfo.is_distribut
1329 1318 && th.data.dis_config && th.data.dis_config.is_yongjin_dk){
1330   - var fir_num=0;
1331   - var sec_num=0;
1332   - var thi_num=0;
1333   - if(th.data.dis_config.pattern==1){
1334   - fir_num=(t.data.data.fir_rate || 0)*gg.goods_num;
1335   - sec_num=(t.data.data.sec_rate || 0)*gg.goods_num;
1336   - thi_num=(t.data.data.thi_rate || 0)*gg.goods_num;
1337   - }else{
1338   - fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2);
1339   - sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2);
1340   - thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2);
1341   - }
1342   - var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th);
  1319 +
  1320 + var c_num=getApp().get_commission(th.data.dis_config,t.data.data,gg.goods_num);
1343 1321  
1344 1322 gd.use_commission=c_num;
1345 1323 t.data.data.use_commission=c_num;
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @bfd4198
... ... @@ -401,20 +401,7 @@ Page({
401 401 //-- 计算获得佣金的金额 --
402 402 if (getApp().globalData.userInfo.is_distribut
403 403 && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
404   - var fir_num = 0;
405   - var sec_num = 0;
406   - var thi_num = 0;
407   - if (th.data.dis_config.pattern == 1) {
408   - fir_num = (inte_data.fir_rate || 0) * gg.goods_num;
409   - sec_num = (inte_data.sec_rate || 0) * gg.goods_num;
410   - thi_num = (inte_data.thi_rate || 0) * gg.goods_num;
411   - } else {
412   - fir_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2);
413   - sec_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2);
414   - thi_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2);
415   - }
416   - var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th);
417   -
  404 + var c_num = getApp().get_commission(th.data.dis_config,inte_data, gg.goods_num);
418 405 t.data.data.use_commission = c_num;
419 406  
420 407 }
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @bfd4198
... ... @@ -283,19 +283,8 @@ Page({
283 283 //-- 计算获得佣金的金额 --
284 284 if (getApp().globalData.userInfo.is_distribut
285 285 && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
286   - var fir_num = 0;
287   - var sec_num = 0;
288   - var thi_num = 0;
289   - if (th.data.dis_config.pattern == 1) {
290   - fir_num = (t.data.data.fir_rate || 0) * gg.goods_num;
291   - sec_num = (t.data.data.sec_rate || 0) * gg.goods_num;
292   - thi_num = (t.data.data.thi_rate || 0) * gg.goods_num;
293   - } else {
294   - fir_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2);
295   - sec_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2);
296   - thi_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2);
297   - }
298   - var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th);
  286 +
  287 + var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num);
299 288  
300 289 gd.use_commission = c_num;
301 290 t.data.data.use_commission = c_num;
... ...
pages/distribution/distribution.js
  View file @bfd4198
... ... @@ -22,7 +22,7 @@ Page({
22 22 userInfo: app.globalData.userInfo,
23 23 });
24 24 }else{
25   - getApp().goto("/pages/togoin/togoin") //跳到非tabbar页
  25 + getApp().goto("/packageE/pages/togoin/togoin") //跳到非tabbar页
26 26 }
27 27 wx.setNavigationBarTitle({
28 28 title: "我的分销",
... ... @@ -340,6 +340,6 @@ Page({
340 340 },
341 341  
342 342 go_login(){
343   - getApp().goto("/pages/togoin/togoin") //跳到非tabbar页
  343 + getApp().goto("/packageE/pages/togoin/togoin") //跳到非tabbar页
344 344 }
345 345 })
346 346 \ No newline at end of file
... ...
pages/giftpack/birthdaygift/birthdaygift.js
  View file @bfd4198
... ... @@ -127,7 +127,7 @@ Page({
127 127 //--先判断会员状态--
128 128 var user_info = getApp().globalData.userInfo;
129 129 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
130   - getApp().goto('/pages/togoin/togoin');
  130 + getApp().goto('/packageE/pages/togoin/togoin');
131 131 return false;
132 132 }
133 133 this.GetList();
... ...
pages/giftpack/buygiftpack/giftpackbuy.js
  View file @bfd4198
... ... @@ -135,7 +135,7 @@ Page({
135 135 getApp().is_Single_page(this, function () {
136 136 var user_info = getApp().globalData.userInfo;
137 137 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
138   - getApp().goto('/pages/togoin/togoin');
  138 + getApp().goto('/packageE/pages/togoin/togoin');
139 139 return false;
140 140 }
141 141 com.wait_for_store_config(th);
... ...
pages/giftpack/evaluategift/evaluategift.js
  View file @bfd4198
... ... @@ -160,7 +160,7 @@ Page({
160 160 //--先判断会员状态--
161 161 var user_info = getApp().globalData.userInfo;
162 162 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
163   - getApp().goto('/pages/togoin/togoin');
  163 + getApp().goto('/packageE/pages/togoin/togoin');
164 164 return false;
165 165 }
166 166  
... ...
pages/giftpack/festival/festival.js
  View file @bfd4198
... ... @@ -133,7 +133,7 @@ Page({
133 133 //--先判断会员状态--
134 134 var user_info = getApp().globalData.userInfo;
135 135 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
136   - getApp().goto('/pages/togoin/togoin');
  136 + getApp().goto('/packageE/pages/togoin/togoin');
137 137 return false;
138 138 }
139 139 this.is_festival();
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @bfd4198
... ... @@ -167,7 +167,7 @@ Page({
167 167 //--先判断会员状态--
168 168 var user_info = getApp().globalData.userInfo;
169 169 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
170   - getApp().goto('/pages/togoin/togoin');
  170 + getApp().goto('/packageE/pages/togoin/togoin');
171 171 return false;
172 172 }
173 173 this.init();
... ... @@ -903,7 +903,7 @@ Page({
903 903  
904 904 clickShare() {
905 905 if (!getApp().globalData.user_id) {
906   - getApp().goto("/pages/togoin/togoin");
  906 + getApp().goto("/packageE/pages/togoin/togoin");
907 907 return false;
908 908 }
909 909 this.setData({
... ... @@ -930,7 +930,7 @@ Page({
930 930 var user_info = getApp().globalData.userInfo;
931 931 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
932 932 //getApp().my_warnning("请先登录",0,this);
933   - wx.navigateTo({url: '/pages/togoin/togoin',})
  933 + wx.navigateTo({url: '/packageE/pages/togoin/togoin',})
934 934 return false;
935 935 }
936 936  
... ... @@ -957,9 +957,6 @@ Page({
957 957 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
958 958 os.stoid + "?sceneValue=" + scene + "&pageValue=pages/giftpack/giftpacklist/giftpacklist";
959 959  
960   - console.log("11111");
961   - console.log(path3);
962   -
963 960 // 读取文件成功则OK--
964 961 wx.getImageInfo({
965 962 src: path3,
... ... @@ -982,9 +979,6 @@ Page({
982 979 canvasId: 'share',
983 980 success: function (res) {
984 981  
985   -
986   - console.log(res.tempFilePath)
987   -
988 982 that.setData({
989 983 shareImgPath: res.tempFilePath,
990 984 canvasHidden: true
... ...
pages/giftpack/mygiftpack/mygiftpack.js
  View file @bfd4198
... ... @@ -83,7 +83,7 @@ Page({
83 83 getApp().is_Single_page(this, function () {
84 84 var user_info = getApp().globalData.userInfo;
85 85 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
86   - getApp().goto('/pages/togoin/togoin');
  86 + getApp().goto('/packageE/pages/togoin/togoin');
87 87 return false;
88 88 }
89 89 this.init()
... ...
pages/giftpack/newvipgift/newvipgift.js
  View file @bfd4198
... ... @@ -126,7 +126,7 @@ Page({
126 126 //--先判断会员状态--
127 127 var user_info = getApp().globalData.userInfo;
128 128 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
129   - getApp().goto('/pages/togoin/togoin');
  129 + getApp().goto('/packageE/pages/togoin/togoin');
130 130 return false;
131 131 }
132 132 this.GetList();
... ...
pages/goods/categoryList/categoryList.js
  View file @bfd4198
... ... @@ -604,7 +604,7 @@ Page({
604 604 }
605 605  
606 606 //进行排序，只有是默认排序的时候，才按首字母排序
607   - if(parseInt(s.data.is_used_share)!=0) continue;
  607 + // if(parseInt(s.data.is_used_share)!=0) continue;
608 608  
609 609 if (arr.length>0){
610 610 var find = 0;
... ... @@ -625,14 +625,14 @@ Page({
625 625 arr.push(item);
626 626 }
627 627 }
628   - if(parseInt(s.data.is_used_share)==0){
629   - arr.sort(compare("zm"));
630   - }else{
631   - var ob={array:dda};
632   - arr.push(ob);
633   - }
  628 + // if(parseInt(s.data.is_used_share)==0){
  629 + // arr.sort(compare("zm"));
  630 + // }else{
  631 + // var ob={array:dda};
  632 + // arr.push(ob);
  633 + // }
634 634  
635   -
  635 + arr.sort(compare("zm"));
636 636  
637 637 s.setData({ groups: arr });
638 638 //console.log(s.data.groups)
... ...
pages/goods/categoryList/categoryList.wxml
  View file @bfd4198
... ... @@ -82,6 +82,9 @@
82 82 </scroll-view>
83 83  
84 84 <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend" >
  85 +<!-- <image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
  86 + <!-- <icon color="icon-close" color="#000" size="30" type="icon-shangjiantou" style=""></icon> -->
  87 + <view class="iconfont icon-shangjiantou"></view>
85 88 <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"
86 89 class="flex box box-align-center box-pack-center letter">
87 90 <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
... ... @@ -226,7 +229,7 @@
226 229 </view>
227 230 </block>
228 231 <!-- 品牌 -->
229   - <block wx:if="{{select_classify_on==220&&is_show_pp}}">
  232 +<!-- <block wx:if="{{select_classify_on==220&&is_show_pp}}">
230 233  
231 234 <view class="classify_name fs28 flex-space-between">
232 235 <view>{{classify_name}}</view>
... ... @@ -246,7 +249,36 @@
246 249  
247 250 </block>
248 251 </view>
249   - </block>
  252 + </block> -->
  253 + <block wx:if="{{select_classify_on==220&&is_show_pp}}">
  254 + <scroll-view scroll-y="true" class="fenlei-list"
  255 + style="height: 100%;padding-bottom:100rpx;" scroll-into-view="{{scrollIntoView}}">
  256 + <view class="classify_name fs28 flex-space-between">
  257 + <view>{{classify_name}}</view>
  258 + </view>
  259 + <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
  260 + <view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
  261 + <view class="classify_content-frame flex flex-wrap">
  262 + <view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
  263 + <view class="t-c">
  264 + <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
  265 + <view class="brand_img_name ellipsis-1 fs24">{{user.name}}2</view>
  266 + </view>
  267 + </view>
  268 + </view>
  269 + </block>
  270 + </scroll-view>
  271 + <view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" >
  272 + <view class="iconfont icon-shangjiantou"></view>
  273 + <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"
  274 + class="flex box box-align-center box-pack-center letter">
  275 + <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
  276 + </view>
  277 + </view>
  278 + </block>
  279 +
  280 +
  281 +
250 282  
251 283 <!-- 卡项 -->
252 284 <!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> -->
... ... @@ -462,7 +494,7 @@
462 494  
463 495  
464 496 <!-- 品牌 -->
465   - <block wx:if="{{select_classify_on==220&&is_show_pp}}">
  497 +<!-- <block wx:if="{{select_classify_on==220&&is_show_pp}}">
466 498  
467 499 <view class="classify_name fs28 flex-space-between">
468 500 <view>{{classify_name}}</view>
... ... @@ -478,11 +510,40 @@
478 510 <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
479 511 </view>
480 512 </view>
481   -
482   -
483 513 </block>
484 514 </view>
485   - </block>
  515 + </block> -->
  516 +
  517 + <!-- 品牌 -->
  518 + <block wx:if="{{select_classify_on==220&&is_show_pp}}">
  519 + <scroll-view scroll-y="true" class="fenlei-list"
  520 + style="height: 100%;padding-bottom:100rpx;" scroll-into-view="{{scrollIntoView}}">
  521 + <view class="classify_name fs28 flex-space-between">
  522 + <view>{{classify_name}}</view>
  523 + </view>
  524 + <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
  525 + <view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
  526 + <view class="classify_content-frame flex flex-wrap">
  527 + <view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
  528 + <view class="t-c">
  529 + <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
  530 + <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
  531 + </view>
  532 + </view>
  533 + </view>
  534 + </block>
  535 + </scroll-view>
  536 + <view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" >
  537 + <!-- <image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
  538 + <view class="iconfont icon-shangjiantou"></view>
  539 + <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"
  540 + class="flex box box-align-center box-pack-center letter">
  541 + <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
  542 + </view>
  543 + </view>
  544 + </block>
  545 +
  546 +
486 547  
487 548  
488 549 <!-- 卡项 -->
... ...
pages/goods/categoryList/categoryList.wxss
  View file @bfd4198
... ... @@ -329,6 +329,15 @@ width: 60%;
329 329 flex-wrap:wrap;
330 330 overflow-y:scroll;
331 331 }
  332 +
  333 + .classify_content-frame2{
  334 + box-sizing: border-box;
  335 + width: 100%;
  336 + padding: 0 12rpx;
  337 + flex-wrap:wrap;
  338 + }
  339 +
  340 +
332 341 .country_img-frame{
333 342 width: 48%;
334 343 height: 140rpx;
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @bfd4198
... ... @@ -2272,7 +2272,7 @@ Page({
2272 2272 var user_info = getApp().globalData.userInfo;
2273 2273 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2274 2274 wx.navigateTo({
2275   - url: '/pages/togoin/togoin',
  2275 + url: '/packageE/pages/togoin/togoin',
2276 2276 })
2277 2277 return false;
2278 2278 }
... ... @@ -2297,7 +2297,7 @@ Page({
2297 2297 var user_info = getApp().globalData.userInfo;
2298 2298 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2299 2299 wx.navigateTo({
2300   - url: '/pages/togoin/togoin',
  2300 + url: '/packageE/pages/togoin/togoin',
2301 2301 })
2302 2302 return false;
2303 2303 }
... ... @@ -4234,7 +4234,7 @@ Page({
4234 4234 var user_info = getApp().globalData.userInfo;
4235 4235 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
4236 4236 wx.navigateTo({
4237   - url: '/pages/togoin/togoin',
  4237 + url: '/packageE/pages/togoin/togoin',
4238 4238 })
4239 4239 return false;
4240 4240 }
... ... @@ -4833,7 +4833,7 @@ Page({
4833 4833 var user_info = getApp().globalData.userInfo;
4834 4834 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
4835 4835 wx.navigateTo({
4836   - url: '/pages/togoin/togoin',
  4836 + url: '/packageE/pages/togoin/togoin',
4837 4837 })
4838 4838 return false;
4839 4839 }
... ... @@ -5028,7 +5028,7 @@ Page({
5028 5028 var user_info = getApp().globalData.userInfo;
5029 5029 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
5030 5030 //getApp().my_warnning("请先登录",0,this);
5031   - wx.navigateTo({url: '/pages/togoin/togoin',})
  5031 + wx.navigateTo({url: '/packageE/pages/togoin/togoin',})
5032 5032 return false;
5033 5033 }
5034 5034  
... ... @@ -6516,7 +6516,7 @@ Page({
6516 6516  
6517 6517 clickShare() {
6518 6518 if(!getApp().globalData.user_id){
6519   - getApp().goto("/pages/togoin/togoin");
  6519 + getApp().goto("/packageE/pages/togoin/togoin");
6520 6520 return false;
6521 6521 }
6522 6522 this.setData({
... ... @@ -6817,7 +6817,7 @@ Page({
6817 6817 let user_info = getApp().globalData.userInfo;
6818 6818 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
6819 6819 wx.navigateTo({
6820   - url: '/pages/togoin/togoin',
  6820 + url: '/packageE/pages/togoin/togoin',
6821 6821 })
6822 6822 return false;
6823 6823 };
... ...
pages/goods/goodsList/goodsList.js
  View file @bfd4198
... ... @@ -462,8 +462,8 @@ Page({
462 462  
463 463 go_url:function (e) {
464 464 var url = e.currentTarget.dataset.url;
465   - var rq_data = JSON.stringify(this.data.rq_data);
466   - url += `&o=${rq_data}`;
  465 + //var rq_data = JSON.stringify(this.data.rq_data);
  466 + //url += `&o=${rq_data}`;
467 467 // console.log('url!!!=======<<<<', url);
468 468 getApp().goto(url);
469 469 }
... ...
pages/index/index/full_screen.js
  View file @bfd4198
... ... @@ -13,14 +13,18 @@
13 13 getApp().promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + stoid,{
14 14 data: { enabled: 1 }
15 15 }).then(res=>{
  16 +
16 17 //判断是不是有全屏广告
  18 + // res.data.data.pageData[0].show_type=1
17 19 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
18 20 getApp().globalData.full_screen=res.data.data.pageData[0];
19 21 th.setData({
20 22 is_full_screen_show:1,
21 23 full_ad:res.data.data.pageData[0],
  24 + sec_show: res.data.data.pageData[0].show_second || 3
22 25 })
23   - //--定时关闭--
  26 + //--定时关闭--
  27 + console.log(th.data.sec_show)
24 28 th.data.full_screen=setInterval(function(){
25 29 if(!th.data.sec_show) {
26 30 clearInterval(th.data.full_screen);
... ... @@ -30,6 +34,10 @@
30 34 th.data.sec_show--;
31 35 th.setData({sec_show:th.data.sec_show});
32 36 },1000)
  37 +
  38 + if(res.data.data.pageData[0].show_type==1){
  39 + clearInterval(th.data.full_screen);
  40 + }
33 41 }else{
34 42 getApp().globalData.full_screen=true;
35 43 }
... ...
pages/index/index/index.js
  View file @bfd4198
... ... @@ -1031,7 +1031,7 @@ Page({
1031 1031 var user_info = getApp().globalData.userInfo;
1032 1032 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
1033 1033 wx.navigateTo({
1034   - url: '/pages/togoin/togoin',
  1034 + url: '/packageE/pages/togoin/togoin',
1035 1035 //url: '/pages/getphone/getphone',
1036 1036 })
1037 1037 return false;
... ... @@ -1219,7 +1219,7 @@ Page({
1219 1219 go_pre: function (e) {
1220 1220 var userInfo = getApp().globalData.userInfo;
1221 1221 if (!userInfo) {
1222   - getApp().goto("/pages/togoin/togoin");
  1222 + getApp().goto("/packageE/pages/togoin/togoin");
1223 1223 return false;
1224 1224 }
1225 1225 var url = e.currentTarget.dataset.url;
... ...
pages/index/index/index.wxml
  View file @bfd4198
1   -<!-- <view hidden="{{f_hidden}}" class="full_screen" style="background-color: #fff;"></view> -->
2   -<!-- <full_screen id="full_screen"></full_screen> -->
3 1  
4   -<!-- 全屏控制 -->
5   -<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');">
6   - <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view>
  2 + <!-- 全屏控制 -->
  3 +<view wx:if="{{is_full_screen_show && full_ad && !full_ad.show_type}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');">
  4 + <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view>
7 5 </view>
8 6  
  7 + <!-- 居中弹窗广告 -->
  8 +<view wx:if="{{is_full_screen_show && full_ad && full_ad.show_type==1}}" class="full_screen full_img_main" catchtap="close_full_screen">
  9 + <icon catchtap="close_full_screen" color="#fff" size="30" type="cancel" style="margin-bottom:40rpx;align-self: flex-end;margin-right:30rpx;"></icon>
  10 + <image bindtap="go_full_ad" src="{{url+full_ad.ad_code}}" style="width:615rpx;" mode="widthFix"></image>
  11 + <!-- <image catchtap="close_full_screen" src="/images/close.png" style="width:72rpx;height:72rpx;margin-top:30rpx;"></image> -->
  12 +</view>
  13 +
  14 +
9 15 <!--普通界面-->
10 16 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
11 17  
... ... @@ -27,10 +33,6 @@
27 33 <view class="search-box flex-center white">
28 34 <view class="classify-frame t-c" bindtap="go_cate">
29 35 <image class="classify-img" src="{{url}}/miniapp/images/classify.png"></image>
30   - <!-- <view class="fs20">分类</view> -->
31   - <!-- <view class="fs20">分类
32   - <text class="white fs22">类</text>
33   - </view> -->
34 36 </view>
35 37 <view class="search-inner">
36 38 <view class="search-img">
... ... @@ -40,7 +42,6 @@
40 42 </view>
41 43 <view class="classify-frame t-c" bindtap="getScancode">
42 44 <image class="classify-img" src="{{url}}/miniapp/images/scanning.png"></image>
43   - <!-- <view class="fs20">扫一扫</view> -->
44 45 </view>
45 46 </view>
46 47 </view>
... ... @@ -59,33 +60,8 @@
59 60 </swiper-item>
60 61 </swiper>
61 62  
62   - <!-- <view class="flex-center-around translation abs">
63   - <view class="circle spot" wx:for="{{banner}}" wx:key="{{index}}" style="background-color:{{index==banner_index?'#fff':'rgba(255,255,255,.5)'}}">
64   - </view>
65   - </view> -->
66 63 </view>
67   - <!-- <view class="pd-view" wx:else></view> -->
68   -
69   - <!-- <view class="flex-center-around {{banner==null?'mar-top':'mar-tops'}}">
70   - <view class="flex-vertical">
71   - <image class="xc-hook" src="{{url}}/miniapp/images/index/youxuan.png">
72   - </image>
73   - <text bindtap='go_test' class="yellow-co fs26 margin-left" data-url="../../../packageA/pages/prom_list/prom_list">人工优先</text>
74   - </view>
75   -
76   -
77   - <view class="flex-vertical">
78   - <image class="xc-hook" src="{{url}}/miniapp/images/index/zhengpin.png">
79   - </image>
80   - <text class="yellow-co fs26 margin-left">正品保证</text>
81   - </view>
82   -
83   - <view class="flex-vertical">
84   - <image class="xc-hook" src="{{url}}/miniapp/images/index/shouhou.png">
85   - </image>
86   - <text class="yellow-co fs26 margin-left">售后无忧</text>
87   - </view>
88   - </view> -->
  64 +
89 65  
90 66 <!---导航-->
91 67 <view class="venues_box">
... ... @@ -153,9 +129,6 @@
153 129 </swiper>
154 130 </block>
155 131  
156   - <!-- <view class="split-line"></view> -->
157   -
158   -
159 132 <!--秒杀-->
160 133 <view class="seckill" wx:if="{{saleGoods!=null && saleGoods.length!=0 }}">
161 134 <navigator url="/pages/activity/seckill_list/seckill_list" hover-class="none">
... ... @@ -185,17 +158,13 @@
185 158 <!-- <view class="red-co mar-top10 is_seckill_height"> -->
186 159 <view class="co-red mar-top10">
187 160 <text class="fs20">￥</text>{{aitem.price}}
188   -<!-- <text class="un_line">￥{{aitem.shop_price}}</text>-->
189 161 </view>
190 162 </navigator>
191 163  
192 164  
193 165 </swiper-item>
194 166 </swiper>
195   - <!-- <view class="flex-center-around translation">
196   - <view class="circle spot" wx:for="{{saleGoods}}" wx:key="{{index}}" style="background:{{index==flash_index?'#fff':'#999'}}">
197   - </view>
198   - </view> -->
  167 +
199 168 </view>
200 169 </view>
201 170  
... ... @@ -364,10 +333,6 @@
364 333 </swiper-item>
365 334 </swiper>
366 335  
367   - <!-- <view class="flex-center-around translations abs">
368   - <view class="circle spot" wx:for="{{pindGoods}}" wx:key="{{index}}" style="background:{{index==pt_index?'#fff':'#999'}}">
369   - </view>
370   - </view> -->
371 336 </view>
372 337 </view>
373 338  
... ... @@ -392,13 +357,6 @@
392 357 </view>
393 358 </view>
394 359  
395   - <!-- 英文标题 -->
396   - <!-- <view class="english flex-center">
397   - <view class="silk"></view>
398   - <view class="esh five-level-word">GOOD HOT THING</view>
399   - <view class="silk"></view>
400   - </view> -->
401   -
402 360 </view>
403 361 <!-- 商品列表组件 -->
404 362 <goods_recommend id="goods_list"></goods_recommend>
... ... @@ -434,17 +392,7 @@
434 392 </block>
435 393 </view>
436 394 <!-- 撑开层 -->
437   - <view>
438   - <!-- 关注层的撑开 -->
439   - <!-- <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view> -->
440   - <!-- <block wx:for="{{template_arr}}" >
441   - <block wx:if="{{item.content.is_top==1 && item.ename=='searchbox'}}">
442   - <view wx:if="{{item.content.style==1}}" style="height: 115rpx;"></view>
443   - <view wx:if="{{item.content.style==2}}" style="height: 89rpx;"></view>
444   - </block>
445   - <view wx:if="{{item.content.is_top==1 && item.ename=='store_select'}}" style="height: 100rpx;"></view>
446   - </block> -->
447   - </view>
  395 + <view></view>
448 396  
449 397 <block wx:for="{{template_arr}}" wx:key="{{index}}">
450 398 <view>
... ... @@ -536,11 +484,7 @@
536 484 </view>
537 485  
538 486 </block>
539   -
540   - <!-- 直播 -->
541   - <!-- <block wx:if="{{item.ename=='nav'}}"> -->
542   -
543   -
  487 +
544 488 <!-- 技术支持 -->
545 489 <view class="logo-container t-c">
546 490 <view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
... ...
pages/index/index/index.wxss
  View file @bfd4198
... ... @@ -1215,3 +1215,22 @@ page {
1215 1215 background-color: #ccc;
1216 1216 }
1217 1217  
  1218 +
  1219 +/* 居中广告 */
  1220 +.full_img_main{
  1221 + display: flex;
  1222 + align-items: center;
  1223 + justify-content: center;
  1224 + flex-direction: column;
  1225 +}
  1226 +
  1227 +.full_img_close{
  1228 + width: 80rpx;
  1229 + height: 80rpx;
  1230 + border-radius: 100%;
  1231 + border: 2rpx solid #000;
  1232 + background-color: #fff;
  1233 + display: flex;
  1234 + align-items: center;
  1235 + justify-items: center;
  1236 +}
... ...
pages/team/team_show/team_show.js
  View file @bfd4198
... ... @@ -163,7 +163,7 @@ Page({
163 163 //--先判断会员状态--
164 164 var user_info=getApp().globalData.userInfo;
165 165 if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){
166   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  166 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
167 167 return false;
168 168 }
169 169  
... ...
pages/team/team_success/team_success.js
  View file @bfd4198
... ... @@ -844,7 +844,7 @@ Page({
844 844  
845 845 clickShare() {
846 846 if(!getApp().globalData.user_id){
847   - getApp().goto("/pages/togoin/togoin");
  847 + getApp().goto("/packageE/pages/togoin/togoin");
848 848 return false;
849 849 }
850 850 this.setData({
... ...
pages/user/assistance/assistance.js
  View file @bfd4198
... ... @@ -54,7 +54,7 @@ Page({
54 54 getApp().is_Single_page(this, function () {
55 55 var user_info = getApp().globalData.userInfo;
56 56 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
57   - getApp().goto('/pages/togoin/togoin');
  57 + getApp().goto('/packageE/pages/togoin/togoin');
58 58 return false;
59 59 }
60 60 // 助力活动
... ...
pages/user/assistance/friend_assistance.js
  View file @bfd4198
... ... @@ -58,7 +58,7 @@ Page({
58 58 //--先判断会员状态--
59 59 var user_info = getApp().globalData.userInfo;
60 60 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
61   - getApp().goto('/pages/togoin/togoin');
  61 + getApp().goto('/packageE/pages/togoin/togoin');
62 62 return false;
63 63 }
64 64  
... ... @@ -118,7 +118,7 @@ Page({
118 118 var user_info = getApp().globalData.userInfo;
119 119 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
120 120 wx.navigateTo({
121   - url: '/pages/togoin/togoin',
  121 + url: '/packageE/pages/togoin/togoin',
122 122 })
123 123 return false;
124 124 }
... ...
pages/user/assistance/giftpacklist.js
  View file @bfd4198
... ... @@ -71,7 +71,7 @@ Page({
71 71 //--先判断会员状态--
72 72 var user_info = getApp().globalData.userInfo;
73 73 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
74   - getApp().goto('/pages/togoin/togoin');
  74 + getApp().goto('/packageE/pages/togoin/togoin');
75 75 return false;
76 76 }
77 77  
... ...
pages/user/assistance/task_assistance.js
  View file @bfd4198
... ... @@ -143,7 +143,7 @@ Page({
143 143 //--先判断会员状态--
144 144 var user_info = getApp().globalData.userInfo;
145 145 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
146   - getApp().goto('/pages/togoin/togoin');
  146 + getApp().goto('/packageE/pages/togoin/togoin');
147 147 return false;
148 148 }
149 149  
... ...
pages/user/cardinfo/cardinfo.js
  View file @bfd4198
... ... @@ -53,7 +53,7 @@ Page({
53 53 //--先判断会员状态--
54 54 var user_info = getApp().globalData.userInfo;
55 55 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
56   - wx.navigateTo({ url: '/pages/togoin/togoin' })
  56 + wx.navigateTo({ url: '/packageE/pages/togoin/togoin' })
57 57 return false;
58 58 }
59 59  
... ...
pages/user/index/filter.wxs
  View file @bfd4198
... ... @@ -21,6 +21,7 @@ var is_close = function (name,c_list) {
21 21 map['套盒商品']="19";
22 22 map['AI测肤']="20";
23 23 map['附近门店']="21";
  24 + map['积分签到']="22";
24 25 var index=map[name];
25 26  
26 27 //我的权益要判断5，和11
... ...
pages/user/index/index.js
  View file @bfd4198
... ... @@ -47,6 +47,9 @@ Page({
47 47 add_card_data: '', //等级卡的内容
48 48 getusercode_vailtime:10,//会员二维码时效
49 49 hiddenCS: true,
  50 +
  51 + is_show_recommend:false
  52 +
50 53 },
51 54 goto_nav: function (e) {
52 55 var th = this;
... ... @@ -55,7 +58,7 @@ Page({
55 58 getApp().goto(url);
56 59 } else {
57 60 wx.navigateTo({
58   - url: '/pages/togoin/togoin',
  61 + url: '/packageE/pages/togoin/togoin',
59 62 })
60 63 }
61 64 },
... ... @@ -152,24 +155,7 @@ Page({
152 155 })
153 156 var th = this;
154 157  
155   - // 判断是否开启美业
156   - getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
157   - if (res.data.code == 0) {
158   - th.setData({
159   - enableMeiye: res.data.data.EnableMeiye,
160   - });
161   - };
162   - });
163   -
164 158  
165   - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
166   - if (res.data.code == 0) {
167   - var plusCard = res.data.data;
168   - for (var i = 0; i < plusCard.length; i++) {
169   - if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; }
170   - }
171   - }
172   - })
173 159  
174 160 if (typeof this.getTabBar === 'function' && this.getTabBar()) {
175 161 var index = getApp().getPageIndex(this);
... ... @@ -189,6 +175,26 @@ Page({
189 175 var e = getApp().globalData.userInfo;
190 176 if (e != undefined && e != null && e.mobile) {
191 177  
  178 +
  179 + // 判断是否开启美业
  180 + getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
  181 + if (res.data.code == 0) {
  182 + th.setData({
  183 + enableMeiye: res.data.data.EnableMeiye,
  184 + });
  185 + };
  186 + });
  187 +
  188 + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
  189 + if (res.data.code == 0) {
  190 + var plusCard = res.data.data;
  191 + for (var i = 0; i < plusCard.length; i++) {
  192 + if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; }
  193 + }
  194 + }
  195 + })
  196 +
  197 +
192 198 this.birthday();
193 199 this.is_assistance();
194 200  
... ... @@ -451,15 +457,22 @@ Page({
451 457 }
452 458 })
453 459 //th.requestRecommend();
  460 +
  461 + //自定义组件一定要等到页面加载完了，才来调用selectComponnent
  462 + setTimeout(function () {
  463 +
  464 + th.setData({ is_show_recommend:true })
  465 +
  466 + if (getApp().globalData.user_id) getApp().requestCardNum(th);
  467 + var goods_list = th.selectComponent("#goods_recommend"); //组件的id
  468 + goods_list.init();
  469 + goods_list.get_list();
  470 + }, 800)
454 471 }
455 472  
456   - //自定义组件一定要等到页面加载完了，才来调用selectComponnent
457   - setTimeout(function () {
458   - if (getApp().globalData.user_id) getApp().requestCardNum(th);
459   - var goods_list = th.selectComponent("#goods_recommend"); //组件的id
460   - goods_list.init();
461   - goods_list.get_list();
462   - }, 800)
  473 +
  474 +
  475 +
463 476 },
464 477  
465 478 //判断会员是后有改服务项目
... ... @@ -498,11 +511,14 @@ Page({
498 511 */
499 512 onReachBottom: function () {
500 513 //!this.nomore && this.requestRecommend();
501   - var goods_list = this.selectComponent("#goods_recommend"); //组件的id
502   - goods_list.init();
503   - setTimeout(function () {
504   - goods_list.get_list();
505   - }, 300)
  514 + var e = getApp().globalData.userInfo;
  515 + if (e != undefined && e != null && e.mobile) {
  516 + var goods_list = this.selectComponent("#goods_recommend"); //组件的id
  517 + goods_list.init();
  518 + setTimeout(function () {
  519 + goods_list.get_list();
  520 + }, 300)
  521 + }
506 522 },
507 523  
508 524 /**
... ... @@ -581,7 +597,7 @@ Page({
581 597 //--跳到绑定页面--
582 598 gobindtel: function () {
583 599 wx.navigateTo({
584   - url: '/pages/togoin/togoin',
  600 + url: '/packageE/pages/togoin/togoin',
585 601 })
586 602 },
587 603  
... ... @@ -956,7 +972,7 @@ Page({
956 972 let user_info = getApp().globalData.userInfo;
957 973 if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
958 974 wx.navigateTo({
959   - url: '/pages/togoin/togoin',
  975 + url: '/packageE/pages/togoin/togoin',
960 976 })
961 977 return false;
962 978 };
... ...
pages/user/index/index.wxml
  View file @bfd4198
... ... @@ -296,7 +296,9 @@
296 296  
297 297 </view>
298 298 </view>
299   - <view style='width:100%;height:73rpx;'>
  299 +
  300 + <!-- 显示推荐 -->
  301 + <view style='width:100%;height:73rpx;' wx:if="{{is_show_recommend}}">
300 302 <view class="xc-recommend-goods flex-center">
301 303  
302 304 <view class="circle xc-small">
... ... @@ -318,7 +320,9 @@
318 320  
319 321 <!-- 显示商品 -->
320 322 <!-- 好物推荐 -->
  323 + <block wx:if="{{is_show_recommend}}">
321 324 <goods_recommend id="goods_recommend"></goods_recommend>
  325 + </block>
322 326  
323 327 <!-- 技术支持 -->
324 328 <view class="logo-container t-c">
... ...
pages/user/my_service/tment_details.js
  View file @bfd4198
... ... @@ -76,7 +76,7 @@ Page({
76 76  
77 77 var user=getApp().globalData.userInfo;
78 78 if(!user){
79   - getApp().goto("/pages/togoin/togoin");
  79 + getApp().goto("/packageE/pages/togoin/togoin");
80 80 }
81 81  
82 82 },
... ...
pages/user/order_detail/order_detail.js
  View file @bfd4198
... ... @@ -132,7 +132,7 @@ Page({
132 132  
133 133 //------获取订单商品-------
134 134 rq.get("/api/weshop/ordergoods/list",{
135   - data: { store_id: os.stoid, order_id: oid},
  135 + data: { store_id: os.stoid, order_id: oid,pageSize:600},
136 136 success:async function (eb) {
137 137 r.order_goods=eb.data.data.pageData;
138 138 var glist = r.order_goods;
... ...
pages/user/plus/plus.js
  View file @bfd4198
... ... @@ -72,7 +72,7 @@ Page({
72 72 var user_info = getApp().globalData.userInfo;
73 73 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
74 74 wx.navigateTo({
75   - url: '/pages/togoin/togoin?first_leader=' + fir_leader,
  75 + url: '/packageE/pages/togoin/togoin?first_leader=' + fir_leader,
76 76 })
77 77 return false;
78 78 }
... ... @@ -543,7 +543,7 @@ Page({
543 543 var user_info = getApp().globalData.userInfo;
544 544 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
545 545 wx.navigateTo({
546   - url: '/pages/togoin/togoin?first_leader=' + fir_leader,
  546 + url: '/packageE/pages/togoin/togoin?first_leader=' + fir_leader,
547 547 })
548 548 return false;
549 549 }
... ...
project.config.json
  View file @bfd4198
1 1 {
2   - "description": "项目配置文件",
3   - "packOptions": {
4   - "ignore": []
5   - },
  2 + "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
6 3 "setting": {
7 4 "urlCheck": false,
8 5 "es6": true,
... ... @@ -16,7 +13,7 @@
16 13 "autoAudits": false,
17 14 "showShadowRootInWxmlPanel": true,
18 15 "scopeDataCheck": false,
19   - "uglifyFileName": false,
  16 + "uglifyFileName": true,
20 17 "checkInvalidKey": true,
21 18 "checkSiteMap": true,
22 19 "uploadWithSourceMap": true,
... ... @@ -36,1031 +33,19 @@
36 33 "packNpmRelationList": [],
37 34 "minifyWXSS": true,
38 35 "showES6CompileOption": false,
39   - "useSummerCompiler": false
  36 + "useSummerCompiler": false,
  37 + "ignoreUploadUnusedFiles": true
40 38 },
41 39 "compileType": "miniprogram",
42 40 "libVersion": "2.16.0",
43 41 "appid": "wx7406a86b64b58a1d",
44 42 "projectname": "MShopWeApp",
45   - "debugOptions": {
46   - "hidedInDevtools": []
  43 + "packOptions": {
  44 + "ignore": [],
  45 + "include": []
47 46 },
48   - "isGameTourist": false,
49   - "simulatorType": "wechat",
50   - "simulatorPluginLibVersion": {},
51   - "condition": {
52   - "search": {
53   - "list": []
54   - },
55   - "conversation": {
56   - "list": []
57   - },
58   - "plugin": {
59   - "list": []
60   - },
61   - "game": {
62   - "currentL": -1,
63   - "list": []
64   - },
65   - "gamePlugin": {
66   - "list": []
67   - },
68   - "miniprogram": {
69   - "list": [
70   - {
71   - "id": 0,
72   - "name": "启动直播列表页",
73   - "pathName": "pages/justTest/justTest",
74   - "query": "",
75   - "scene": null
76   - },
77   - {
78   - "id": 1,
79   - "name": "liveStreamDetails",
80   - "pathName": "packageA/pages/liveStreamDetails/liveStreamDetails",
81   - "query": "",
82   - "scene": null
83   - },
84   - {
85   - "id": 2,
86   - "name": "justTest",
87   - "pathName": "pages/justTest/justTest",
88   - "query": "",
89   - "scene": null
90   - },
91   - {
92   - "id": 3,
93   - "name": "pages/goods/goodsInfo/goodsInfo",
94   - "pathName": "pages/goods/goodsInfo/goodsInfo",
95   - "query": "",
96   - "scene": null
97   - },
98   - {
99   - "id": -1,
100   - "name": "pages/team/team_show/team_show",
101   - "pathName": "pages/team/team_show/team_show",
102   - "query": "",
103   - "scene": null
104   - },
105   - {
106   - "id": -1,
107   - "name": "pages/index/index/index",
108   - "pathName": "pages/index/index/index",
109   - "query": "",
110   - "scene": null
111   - },
112   - {
113   - "id": -1,
114   - "name": "pages/store/index",
115   - "pathName": "pages/store/index",
116   - "query": "",
117   - "scene": null
118   - },
119   - {
120   - "id": 7,
121   - "name": "packageA/pages/goods_share/goods_share",
122   - "pathName": "packageA/pages/goods_share/goods_share",
123   - "query": "",
124   - "scene": null
125   - },
126   - {
127   - "id": 8,
128   - "name": "packageA/pages/live_share/live_share",
129   - "pathName": "packageA/pages/live_share/live_share",
130   - "query": "",
131   - "scene": null
132   - },
133   - {
134   - "id": -1,
135   - "name": "pages/cart/cart2_pt/cart2_pt",
136   - "pathName": "pages/cart/cart2_pt/cart2_pt",
137   - "query": "",
138   - "scene": null
139   - },
140   - {
141   - "id": -1,
142   - "name": "pages/cart/cart2_pt/cart2_pt",
143   - "pathName": "pages/cart/cart2_pt/cart2_pt",
144   - "query": "",
145   - "scene": null
146   - },
147   - {
148   - "id": -1,
149   - "name": "pages/cart/cart_wk/cart_wk",
150   - "pathName": "pages/index/index/index",
151   - "query": "",
152   - "scene": null
153   - },
154   - {
155   - "id": -1,
156   - "name": "pages/cart_wk/cart_wk/cart_wk",
157   - "pathName": "pages/cart_wk/cart_wk/cart_wk",
158   - "query": "",
159   - "scene": null
160   - },
161   - {
162   - "id": -1,
163   - "name": "pages/cart/cart_wk/cart_wk",
164   - "pathName": "pages/cart/cart_wk/cart_wk",
165   - "query": "",
166   - "scene": null
167   - },
168   - {
169   - "id": -1,
170   - "name": "pages/user/assistance/assistance",
171   - "pathName": "pages/user/assistance/assistance",
172   - "query": "",
173   - "scene": null
174   - },
175   - {
176   - "id": -1,
177   - "name": "pages/goods/search/search",
178   - "pathName": "pages/goods/search/search",
179   - "query": "",
180   - "scene": null
181   - },
182   - {
183   - "id": -1,
184   - "name": "pages/goods/search/search",
185   - "pathName": "pages/goods/search/search",
186   - "query": "",
187   - "scene": null
188   - },
189   - {
190   - "id": -1,
191   - "name": "pages/user/userinfo/userinfo",
192   - "pathName": "pages/user/userinfo/userinfo",
193   - "query": "",
194   - "scene": null
195   - },
196   - {
197   - "id": -1,
198   - "name": "pages/user/goods_share/goods_share",
199   - "pathName": "pages/user/goods_share/goods_share",
200   - "query": "",
201   - "scene": null
202   - },
203   - {
204   - "id": -1,
205   - "name": "packageA//pages/user/goods_share/goods_share",
206   - "pathName": "packageA//pages/user/goods_share/goods_share",
207   - "query": "",
208   - "scene": null
209   - },
210   - {
211   - "id": -1,
212   - "name": "packageA/pages/user/goods_share/goods_share",
213   - "pathName": "packageA/pages/user/goods_share/goods_share",
214   - "query": "",
215   - "scene": null
216   - },
217   - {
218   - "id": 21,
219   - "name": "packageA/pages/goods_share/goods_share",
220   - "pathName": "packageA/pages/addCustomer/addCustomer",
221   - "query": "",
222   - "scene": null
223   - },
224   - {
225   - "id": -1,
226   - "name": "packageA/pages/goods_share/goods_share",
227   - "pathName": "packageA/pages/goods_share/goods_share",
228   - "query": "",
229   - "scene": null
230   - },
231   - {
232   - "id": -1,
233   - "name": "packageA/pages/goods_share/goods_share",
234   - "pathName": "packageA/pages/goods_share/goods_share",
235   - "query": "",
236   - "scene": null
237   - },
238   - {
239   - "id": -1,
240   - "name": "packageA/pages/activity_share/activity_share",
241   - "pathName": "packageA/pages/activity_share/activity_share",
242   - "query": "",
243   - "scene": null
244   - },
245   - {
246   - "id": -1,
247   - "name": "packageA/pages/quan_list/quan_list",
248   - "pathName": "packageA/pages/quan_list/quan_list",
249   - "query": "",
250   - "scene": null
251   - },
252   - {
253   - "id": -1,
254   - "name": "packageA/pages/quan_pro/quan_pro",
255   - "pathName": "packageA/pages/quan_pro/quan_pro",
256   - "query": "",
257   - "scene": null
258   - },
259   - {
260   - "id": -1,
261   - "name": "packageA/pages/quan_list/quan_list",
262   - "pathName": "packageA/pages/quan_list/quan_list",
263   - "query": "",
264   - "scene": null
265   - },
266   - {
267   - "id": -1,
268   - "name": "packageA/pages/quan/quan",
269   - "pathName": "packageA/pages/quan/quan",
270   - "query": "",
271   - "scene": null
272   - },
273   - {
274   - "id": -1,
275   - "name": "packageA/pages/addCustomer/addCustomer",
276   - "pathName": "packageA/pages/addCustomer/addCustomer",
277   - "query": "",
278   - "scene": null
279   - },
280   - {
281   - "id": -1,
282   - "name": "packageA/pages/quan/quan",
283   - "pathName": "packageA/pages/quan/quan",
284   - "query": "",
285   - "scene": null
286   - },
287   - {
288   - "id": -1,
289   - "name": "pages/user/assistance/assistance",
290   - "pathName": "pages/user/assistance/assistance",
291   - "query": "",
292   - "scene": null
293   - },
294   - {
295   - "id": -1,
296   - "name": "packageA/pages/live_share/live_share",
297   - "pathName": "packageA/pages/live_share/live_share",
298   - "query": "",
299   - "scene": null
300   - },
301   - {
302   - "id": -1,
303   - "name": "packageA/pages/quan/quan",
304   - "pathName": "packageA/pages/quan/quan",
305   - "query": "",
306   - "scene": null
307   - },
308   - {
309   - "id": -1,
310   - "name": "pages/user/assistance/assistance",
311   - "pathName": "pages/user/assistance/assistance",
312   - "query": "",
313   - "scene": null
314   - },
315   - {
316   - "id": -1,
317   - "name": "packageA/pages/live_share/live_share",
318   - "pathName": "packageA/pages/live_share/live_share",
319   - "query": "",
320   - "scene": null
321   - },
322   - {
323   - "id": -1,
324   - "name": "packageA/pages/jfbuy/jfbuy",
325   - "pathName": "packageA/pages/jfbuy/jfbuy",
326   - "query": "",
327   - "scene": null
328   - },
329   - {
330   - "id": -1,
331   - "name": "packageA/pages/goods_share/goods_share",
332   - "pathName": "packageA/pages/goods_share/goods_share",
333   - "query": "",
334   - "scene": null
335   - },
336   - {
337   - "id": -1,
338   - "name": "packageA/pages/live_share/live_share",
339   - "pathName": "packageA/pages/live_share/live_share",
340   - "query": "",
341   - "scene": null
342   - },
343   - {
344   - "id": -1,
345   - "name": "packageA/pages/activity_share/activity_share",
346   - "pathName": "packageA/pages/activity_share/activity_share",
347   - "query": "",
348   - "scene": null
349   - },
350   - {
351   - "id": -1,
352   - "name": "packageA/pages/jfbuy/jfbuy",
353   - "pathName": "packageA/pages/jfbuy/jfbuy",
354   - "query": "",
355   - "scene": null
356   - },
357   - {
358   - "id": -1,
359   - "name": "packageA/pages/jfbuy/jfbuy",
360   - "pathName": "packageA/pages/jfbuy/jfbuy",
361   - "query": "",
362   - "scene": null
363   - },
364   - {
365   - "id": -1,
366   - "name": "pages/user/order_list/order_list",
367   - "pathName": "pages/user/order_list/order_list",
368   - "query": "",
369   - "scene": null
370   - },
371   - {
372   - "id": -1,
373   - "name": "pages/shop_details/shop_details",
374   - "pathName": "pages/shop_details/shop_details",
375   - "query": "",
376   - "scene": null
377   - },
378   - {
379   - "id": -1,
380   - "name": "pages/index/index/index",
381   - "pathName": "pages/index/index/index",
382   - "query": "",
383   - "scene": null
384   - },
385   - {
386   - "id": -1,
387   - "name": "packageA/pages/quan/quan",
388   - "pathName": "packageA/pages/quan/quan",
389   - "query": "",
390   - "scene": null
391   - },
392   - {
393   - "id": -1,
394   - "name": "packageA/pages/quan/quan",
395   - "pathName": "packageA/pages/quan/quan",
396   - "query": "",
397   - "scene": null
398   - },
399   - {
400   - "id": -1,
401   - "name": "pages/user/order_list/order_list",
402   - "pathName": "pages/user/order_list/order_list",
403   - "query": "",
404   - "scene": null
405   - },
406   - {
407   - "id": -1,
408   - "name": "packageA/pages/chongzhi/chongzhi",
409   - "pathName": "packageA/pages/chongzhi/chongzhi",
410   - "query": "",
411   - "scene": null
412   - },
413   - {
414   - "id": -1,
415   - "name": "packageA/pages/chongzhiDetails/chongzhiDetails",
416   - "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails",
417   - "query": "",
418   - "scene": null
419   - },
420   - {
421   - "id": -1,
422   - "name": "packageA/pages/chongzhi/chongzhi",
423   - "pathName": "packageA/pages/chongzhi/chongzhi",
424   - "query": "",
425   - "scene": null
426   - },
427   - {
428   - "id": -1,
429   - "name": "packageA/pages/chongzhiDetails/chongzhiDetails",
430   - "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails",
431   - "query": "",
432   - "scene": null
433   - },
434   - {
435   - "id": -1,
436   - "name": "pages/user/deposit/prepaid/prepaid",
437   - "pathName": "pages/user/deposit/prepaid/prepaid",
438   - "query": "",
439   - "scene": null
440   - },
441   - {
442   - "id": -1,
443   - "name": "packageA/pages/chongzhi/chongzhi",
444   - "pathName": "packageA/pages/chongzhi/chongzhi",
445   - "query": "",
446   - "scene": null
447   - },
448   - {
449   - "id": -1,
450   - "name": "packageA/pages/chongzhi/chongzhi",
451   - "pathName": "packageA/pages/chongzhi/chongzhi",
452   - "query": "",
453   - "scene": null
454   - },
455   - {
456   - "id": -1,
457   - "name": "packageA/pages/chongzhi/chongzhi",
458   - "pathName": "packageA/pages/chongzhi/chongzhi",
459   - "query": "",
460   - "scene": null
461   - },
462   - {
463   - "id": -1,
464   - "name": "packageA/pages/chongzhiDetails/chongzhiDetails",
465   - "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails",
466   - "query": "",
467   - "scene": null
468   - },
469   - {
470   - "id": -1,
471   - "name": "packageA/pages/chongzhi/chongzhi",
472   - "pathName": "packageA/pages/chongzhi/chongzhi",
473   - "query": "",
474   - "scene": null
475   - },
476   - {
477   - "id": -1,
478   - "name": "packageA/pages/chongzhiDetails/chongzhiDetails",
479   - "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails",
480   - "query": "",
481   - "scene": null
482   - },
483   - {
484   - "id": -1,
485   - "name": "packageA/pages/chongzhi/chongzhi",
486   - "pathName": "packageA/pages/chongzhi/chongzhi",
487   - "query": "",
488   - "scene": null
489   - },
490   - {
491   - "id": -1,
492   - "name": "packageA/pages/checkin/checkin",
493   - "pathName": "packageA/pages/checkin/checkin",
494   - "query": "",
495   - "scene": null
496   - },
497   - {
498   - "id": -1,
499   - "name": "packageA/pages/jfbuy/jfbuy",
500   - "pathName": "packageA/pages/jfbuy/jfbuy",
501   - "query": "",
502   - "scene": null
503   - },
504   - {
505   - "id": -1,
506   - "name": "packageA/pages/checkin/checkin",
507   - "pathName": "packageA/pages/checkin/checkin",
508   - "query": "",
509   - "scene": null
510   - },
511   - {
512   - "id": -1,
513   - "name": "pages/user/integral/integral",
514   - "pathName": "pages/user/integral/integral",
515   - "query": "",
516   - "scene": null
517   - },
518   - {
519   - "id": -1,
520   - "name": "packageA/pages/checkin/checkin",
521   - "pathName": "packageA/pages/checkin/checkin",
522   - "query": "",
523   - "scene": null
524   - },
525   - {
526   - "id": -1,
527   - "name": "packageA/pages/checkin/checkin",
528   - "pathName": "packageA/pages/checkin/checkin",
529   - "query": "",
530   - "scene": null
531   - },
532   - {
533   - "id": -1,
534   - "name": "packageA/pages/jfbuy/jfbuy",
535   - "pathName": "packageA/pages/jfbuy/jfbuy",
536   - "query": "",
537   - "scene": null
538   - },
539   - {
540   - "id": -1,
541   - "name": "packageA/pages/checkin/checkin",
542   - "pathName": "packageA/pages/checkin/checkin",
543   - "query": "",
544   - "scene": null
545   - },
546   - {
547   - "id": -1,
548   - "name": "packageA/pages/quan_list/quan_list",
549   - "pathName": "packageA/pages/quan_list/quan_list",
550   - "query": "",
551   - "scene": null
552   - },
553   - {
554   - "id": -1,
555   - "name": "packageA/pages/quan/quan",
556   - "pathName": "packageA/pages/quan/quan",
557   - "query": "",
558   - "scene": null
559   - },
560   - {
561   - "id": -1,
562   - "name": "packageA/pages/quan_list/quan_list",
563   - "pathName": "packageA/pages/quan_list/quan_list",
564   - "query": "",
565   - "scene": null
566   - },
567   - {
568   - "id": -1,
569   - "name": "packageA/pages/quan/quan",
570   - "pathName": "packageA/pages/quan/quan",
571   - "query": "",
572   - "scene": null
573   - },
574   - {
575   - "id": -1,
576   - "name": "packageA/pages/quan/quan",
577   - "pathName": "packageA/pages/quan/quan",
578   - "query": "",
579   - "scene": null
580   - },
581   - {
582   - "id": -1,
583   - "name": "packageA/pages/checkin/checkin",
584   - "pathName": "packageA/pages/checkin/checkin",
585   - "query": "",
586   - "scene": null
587   - },
588   - {
589   - "id": -1,
590   - "name": "packageA/pages/chongzhi/chongzhi",
591   - "pathName": "packageA/pages/chongzhi/chongzhi",
592   - "query": "",
593   - "scene": null
594   - },
595   - {
596   - "id": -1,
597   - "name": "pages/user/assistance/assistance",
598   - "pathName": "pages/user/assistance/assistance",
599   - "query": "",
600   - "scene": null
601   - },
602   - {
603   - "id": -1,
604   - "name": "pages/giftpack/mygiftpack/mygiftpack",
605   - "pathName": "pages/giftpack/mygiftpack/mygiftpack",
606   - "query": "",
607   - "scene": null
608   - },
609   - {
610   - "id": -1,
611   - "name": "packageA/pages/quan_list/quan_list",
612   - "pathName": "packageA/pages/quan_list/quan_list",
613   - "query": "",
614   - "scene": null
615   - },
616   - {
617   - "id": -1,
618   - "name": "packageA/pages/service_record/service_record",
619   - "pathName": "packageA/pages/service_record/service_record",
620   - "query": "",
621   - "scene": null
622   - },
623   - {
624   - "id": -1,
625   - "name": "packageA/pages/hongBao/hongBao",
626   - "pathName": "packageA/pages/hongBao/hongBao",
627   - "query": "",
628   - "scene": null
629   - },
630   - {
631   - "id": -1,
632   - "name": "packageA/pages/hongBaoDetails/hongBaoDetails",
633   - "pathName": "packageA/pages/hongBao/hongBao",
634   - "query": "",
635   - "scene": null
636   - },
637   - {
638   - "id": -1,
639   - "name": "packageA/pages/hongBaoDetails/hongBaoDetails",
640   - "pathName": "packageA/pages/hongBaoDetails/hongBaoDetails",
641   - "query": "",
642   - "scene": null
643   - },
644   - {
645   - "id": -1,
646   - "name": "packageA/pages/hongBaoDetails/hongBaoDetails",
647   - "pathName": "packageA/pages/hongBaoDetails/hongBaoDetails",
648   - "query": "",
649   - "scene": null
650   - },
651   - {
652   - "id": -1,
653   - "name": "packageA/pages/hongBao/hongBao",
654   - "pathName": "packageA/pages/hongBao/hongBao",
655   - "query": "",
656   - "scene": null
657   - },
658   - {
659   - "id": -1,
660   - "name": "packageA/pages/hongBaoDetails/hongBaoDetails",
661   - "pathName": "packageA/pages/hongBaoDetails/hongBaoDetails",
662   - "query": "",
663   - "scene": null
664   - },
665   - {
666   - "id": -1,
667   - "name": "packageA/pages/hongBao/hongBao",
668   - "pathName": "packageA/pages/hongBao/hongBao",
669   - "query": "",
670   - "scene": null
671   - },
672   - {
673   - "id": -1,
674   - "name": "packageA/pages/service_record/service_record",
675   - "pathName": "packageA/pages/service_record/service_record",
676   - "query": "",
677   - "scene": null
678   - },
679   - {
680   - "id": -1,
681   - "name": "packageA/pages/distribution/main/main",
682   - "pathName": "packageA/pages/distribution/main/main",
683   - "query": "",
684   - "scene": null
685   - },
686   - {
687   - "id": -1,
688   - "name": "packageA/pages/distribution/myteam/myteam",
689   - "pathName": "packageA/pages/distribution/myteam/myteam",
690   - "query": "",
691   - "scene": null
692   - },
693   - {
694   - "id": -1,
695   - "name": "packageA/pages/distribution/myteam/myteam",
696   - "pathName": "packageA/pages/distribution/myteam/myteam",
697   - "query": "",
698   - "scene": null
699   - },
700   - {
701   - "id": -1,
702   - "name": "packageA/pages/myteam/myteam",
703   - "pathName": "packageA/pages/myteam/myteam",
704   - "query": "",
705   - "scene": null
706   - },
707   - {
708   - "id": -1,
709   - "name": "pages/giftpack/newvipgift/newvipgift",
710   - "pathName": "pages/giftpack/newvipgift/newvipgift",
711   - "query": "",
712   - "scene": null
713   - },
714   - {
715   - "id": -1,
716   - "name": "packageA/pages/distribution/myteam/myteam",
717   - "pathName": "packageA/pages/distribution/myteam/myteam",
718   - "query": "",
719   - "scene": null
720   - },
721   - {
722   - "id": -1,
723   - "name": "packageA/pages/distribution/order/order",
724   - "pathName": "packageA/pages/distribution/order/order",
725   - "query": "",
726   - "scene": null
727   - },
728   - {
729   - "id": -1,
730   - "name": "packageA/pages/distribution/myteam/myteam",
731   - "pathName": "packageA/pages/distribution/myteam/myteam",
732   - "query": "",
733   - "scene": null
734   - },
735   - {
736   - "id": -1,
737   - "name": "packageA/pages/distribution/order/order",
738   - "pathName": "packageA/pages/distribution/order/order",
739   - "query": "",
740   - "scene": null
741   - },
742   - {
743   - "id": -1,
744   - "name": "packageA/pages/distribution/commision/commision",
745   - "pathName": "packageA/pages/distribution/commision/commision",
746   - "query": "",
747   - "scene": null
748   - },
749   - {
750   - "id": -1,
751   - "name": "packageA/pages/distribution/commision/commision",
752   - "pathName": "packageA/pages/distribution/commision/commision",
753   - "query": "",
754   - "scene": null
755   - },
756   - {
757   - "id": -1,
758   - "name": "packageA/pages/distribution/commision/commision",
759   - "pathName": "packageA/pages/distribution/commision/commision",
760   - "query": "",
761   - "scene": null
762   - },
763   - {
764   - "id": -1,
765   - "name": "packageA/pages/distribution/rank/rank",
766   - "pathName": "packageA/pages/distribution/rank/rank",
767   - "query": "",
768   - "scene": null
769   - },
770   - {
771   - "id": -1,
772   - "name": "packageA/pages/distribution/commision/commision",
773   - "pathName": "packageA/pages/distribution/commision/commision",
774   - "query": "",
775   - "scene": null
776   - },
777   - {
778   - "id": -1,
779   - "name": "packageA/pages/distribution/order/order",
780   - "pathName": "packageA/pages/distribution/order/order",
781   - "query": "",
782   - "scene": null
783   - },
784   - {
785   - "id": -1,
786   - "name": "packageA/pages/distribution/myteam/myteam",
787   - "pathName": "packageA/pages/distribution/myteam/myteam",
788   - "query": "",
789   - "scene": null
790   - },
791   - {
792   - "id": -1,
793   - "name": "packageA/pages/distribution/main/main",
794   - "pathName": "packageA/pages/distribution/main/main",
795   - "query": "",
796   - "scene": null
797   - },
798   - {
799   - "id": -1,
800   - "name": "packageA/pages/distribution/card/card",
801   - "pathName": "packageA/pages/distribution/card/card",
802   - "query": "",
803   - "scene": null
804   - },
805   - {
806   - "id": -1,
807   - "name": "packageA/pages/distribution/rank/rank",
808   - "pathName": "packageA/pages/distribution/rank/rank",
809   - "query": "",
810   - "scene": null
811   - },
812   - {
813   - "id": -1,
814   - "name": "packageA/pages/distribution/goods/goods",
815   - "pathName": "packageA/pages/distribution/goods/goods",
816   - "query": "",
817   - "scene": null
818   - },
819   - {
820   - "id": -1,
821   - "name": "packageA/pages/distribution/main/main",
822   - "pathName": "packageA/pages/distribution/main/main",
823   - "query": "",
824   - "scene": null
825   - },
826   - {
827   - "id": -1,
828   - "name": "packageA/pages/distribution/shop/shop",
829   - "pathName": "packageA/pages/distribution/shop/shop",
830   - "query": "",
831   - "scene": null
832   - },
833   - {
834   - "id": -1,
835   - "name": "packageA/pages/distribution/rookie/rookie",
836   - "pathName": "packageA/pages/distribution/rookie/rookie",
837   - "query": "",
838   - "scene": null
839   - },
840   - {
841   - "id": -1,
842   - "name": "packageA/pages/distribution/main/main",
843   - "pathName": "packageA/pages/distribution/main/main",
844   - "query": "",
845   - "scene": null
846   - },
847   - {
848   - "id": -1,
849   - "name": "pages/index/index/index",
850   - "pathName": "pages/index/index/index",
851   - "query": "",
852   - "scene": null
853   - },
854   - {
855   - "id": -1,
856   - "name": "packageA/pages/distribution/main/main",
857   - "pathName": "packageA/pages/distribution/main/main",
858   - "query": "",
859   - "scene": null
860   - },
861   - {
862   - "id": -1,
863   - "name": "packageA/pages/distribution/order/order",
864   - "pathName": "packageA/pages/distribution/order/order",
865   - "query": "",
866   - "scene": null
867   - },
868   - {
869   - "id": -1,
870   - "name": "packageA/pages/distribution/order/order",
871   - "pathName": "packageA/pages/distribution/order/order",
872   - "query": "",
873   - "scene": null
874   - },
875   - {
876   - "id": -1,
877   - "name": "packageA/pages/distribution/rank/rank",
878   - "pathName": "packageA/pages/distribution/rank/rank",
879   - "query": "",
880   - "scene": null
881   - },
882   - {
883   - "id": -1,
884   - "name": "packageA/pages/distribution/myteam/myteam",
885   - "pathName": "packageA/pages/distribution/myteam/myteam",
886   - "query": "",
887   - "scene": null
888   - },
889   - {
890   - "id": -1,
891   - "name": "packageA/pages/distribution/myteam/myteam",
892   - "pathName": "packageA/pages/distribution/myteam/myteam",
893   - "query": "",
894   - "scene": null
895   - },
896   - {
897   - "id": -1,
898   - "name": "packageA/pages/distribution/main/main",
899   - "pathName": "packageA/pages/distribution/main/main",
900   - "query": "",
901   - "scene": null
902   - },
903   - {
904   - "id": -1,
905   - "name": "packageA/pages/distribution/commision/commision",
906   - "pathName": "packageA/pages/distribution/commision/commision",
907   - "query": "",
908   - "scene": null
909   - },
910   - {
911   - "id": -1,
912   - "name": "packageA/pages/distribution/shop/shop",
913   - "pathName": "packageA/pages/distribution/shop/shop",
914   - "query": "",
915   - "scene": null
916   - },
917   - {
918   - "id": -1,
919   - "name": "packageA/pages/distribution/shop/shop",
920   - "pathName": "packageA/pages/distribution/shop/shop",
921   - "query": "",
922   - "scene": null
923   - },
924   - {
925   - "id": -1,
926   - "name": "packageA/pages/distribution/shop/shop",
927   - "pathName": "packageA/pages/distribution/shop/shop",
928   - "query": "",
929   - "scene": null
930   - },
931   - {
932   - "id": -1,
933   - "name": "packageA/pages/distribution/card/card",
934   - "pathName": "packageA/pages/distribution/card/card",
935   - "query": "",
936   - "scene": null
937   - },
938   - {
939   - "id": -1,
940   - "name": "packageA/pages/distribution/main/main",
941   - "pathName": "packageA/pages/distribution/main/main",
942   - "query": "",
943   - "scene": null
944   - },
945   - {
946   - "id": -1,
947   - "name": "packageA/pages/distribution/card/card",
948   - "pathName": "packageA/pages/distribution/card/card",
949   - "query": "",
950   - "scene": null
951   - },
952   - {
953   - "id": -1,
954   - "name": "packageA/pages/distribution/main/main",
955   - "pathName": "packageA/pages/distribution/main/main",
956   - "query": "",
957   - "scene": null
958   - },
959   - {
960   - "id": -1,
961   - "name": "pages/index/index/index",
962   - "pathName": "pages/index/index/index",
963   - "query": "",
964   - "scene": null
965   - },
966   - {
967   - "id": -1,
968   - "name": "packageA/pages/distribution/main/main",
969   - "pathName": "packageA/pages/distribution/main/main",
970   - "query": "",
971   - "scene": null
972   - },
973   - {
974   - "id": -1,
975   - "name": "pages/index/index/index",
976   - "pathName": "pages/index/index/index",
977   - "query": "",
978   - "scene": null
979   - },
980   - {
981   - "id": -1,
982   - "name": "packageA/pages/distribution/main/main",
983   - "pathName": "packageA/pages/distribution/main/main",
984   - "query": "",
985   - "scene": null
986   - },
987   - {
988   - "id": -1,
989   - "name": "packageA/pages/activity_share/activity_share",
990   - "pathName": "packageA/pages/activity_share/activity_share",
991   - "query": "",
992   - "scene": null
993   - },
994   - {
995   - "id": -1,
996   - "name": "packageA/pages/goods_share/goods_share",
997   - "pathName": "packageA/pages/goods_share/goods_share",
998   - "query": "",
999   - "scene": null
1000   - },
1001   - {
1002   - "id": -1,
1003   - "name": "packageA/pages/service_share/service_share",
1004   - "pathName": "packageA/pages/service_share/service_share",
1005   - "query": "",
1006   - "scene": null
1007   - },
1008   - {
1009   - "id": -1,
1010   - "name": "packageA/pages/distribution/main/main",
1011   - "pathName": "packageA/pages/distribution/main/main",
1012   - "query": "",
1013   - "scene": null
1014   - },
1015   - {
1016   - "id": -1,
1017   - "name": "packageA/pages/cardDetails/cardDetails",
1018   - "pathName": "packageA/pages/cardDetails/cardDetails",
1019   - "query": "",
1020   - "scene": null
1021   - },
1022   - {
1023   - "id": -1,
1024   - "name": "pages/user/my_service/i_service",
1025   - "pathName": "pages/user/appment_main/appment_main",
1026   - "query": "",
1027   - "scene": null
1028   - },
1029   - {
1030   - "id": -1,
1031   - "name": "pages/user/appment_main/appment_main",
1032   - "pathName": "pages/user/my_service/appment_main/appment_main",
1033   - "query": "",
1034   - "scene": null
1035   - },
1036   - {
1037   - "id": -1,
1038   - "name": "pages/user/my_service/appment_main",
1039   - "pathName": "pages/user/my_service/appment_main",
1040   - "query": "",
1041   - "scene": null
1042   - },
1043   - {
1044   - "id": -1,
1045   - "name": "packageA/pages/distribution/main/main",
1046   - "pathName": "packageA/pages/distribution/main/main",
1047   - "query": "",
1048   - "scene": null
1049   - },
1050   - {
1051   - "id": -1,
1052   - "name": "pages/index/index/index",
1053   - "pathName": "pages/index/index/index",
1054   - "query": "",
1055   - "scene": null
1056   - },
1057   - {
1058   - "id": -1,
1059   - "name": "packageA/pages/distribution/main/main",
1060   - "pathName": "packageA/pages/distribution/main/main",
1061   - "scene": null
1062   - }
1063   - ]
1064   - }
  47 + "editorSetting": {
  48 + "tabIndent": "insertSpaces",
  49 + "tabSize": 2
1065 50 }
1066 51 }
1067 52 \ No newline at end of file
... ...
utils/auth.js
  View file @bfd4198
... ... @@ -113,7 +113,7 @@ module.exports = {
113 113  
114 114 app.globalData.getu = r;
115 115 wx.navigateTo({
116   - url: '/pages/togoin/togoin',
  116 + url: '/packageE/pages/togoin/togoin',
117 117 })
118 118 }else{
119 119 app.globalData.user_id = e.data.data.user_id;
... ... @@ -225,7 +225,7 @@ module.exports = {
225 225 var a = wx.getStorageSync("wx_user_info");
226 226 var userInfo = a.userInfo;
227 227 if (userInfo==undefined){
228   - n.goto("/pages/togoin/togoin");
  228 + n.goto("/packageE/pages/togoin/togoin");
229 229 }else{
230 230 a && void 0 != a ? (n.globalData.wechatUser = a, o.login(t, a, e)) : o.goGetUserInfo();
231 231 }
... ...
utils/common.js
  View file @bfd4198
... ... @@ -13,7 +13,6 @@ module.exports = {
13 13 app: function() {
14 14 return getApp();
15 15 },
16   -
17 16 //------------获取全路径的图片地址-----------
18 17 getFullUrl: function(e) {
19 18 if(e==undefined || e=="") return "";
... ... @@ -21,11 +20,7 @@ module.exports = {
21 20 e=this.app().globalData.setting.imghost + e;
22 21 return e;
23 22 },
24   - getConfigByName: function(e, t, r) {
25   - for (var a = 0; a < e.length; a++) if (e[a].name === t && (void 0 === r || void 0 !== r && e[a].inc_type === r)) return e[a].value;
26   - return console.warn(t), console.warn(e), null;
27   - },
28   -
  23 +
29 24 //--------跳转到支付页面--------
30 25 jumpToCart4: function(e, r) {
31 26 var a = {
... ... @@ -43,9 +38,6 @@ module.exports = {
43 38 url: n
44 39 });
45 40 },
46   - getCapache: function() {
47   - return this.app().request.modifyUrl("/api/user/verify?is_image=1&t=" + Date.parse(new Date()));
48   - },
49 41 wxParseAddFullImageUrl: function(t, r) {
50 42 if (void 0 !== t.data[r].images) {
51 43 for (var a = t.data[r], n = 0; n < a.images.length; n++) a.images[n].attr.src = this.getFullUrl(a.images[n].attr.src),
... ... @@ -53,35 +45,6 @@ module.exports = {
53 45 console.log(a), t.setData(e({}, r, a));
54 46 }
55 47 },
56   - sendSmsCode: function(e, t, r) {
57   - a = this;
58   - if (!e) return a.app().showWarning("手机号码不能为空");
59   - void 0 !== t && null !== t || (t = 6);
60   - var a = this;
61   - this.app().request.post("/home/api/send_validate_code", {
62   - data: {
63   - mobile: e,
64   - scene: t,
65   - type: "mobile"
66   - },
67   - success: function(e) {
68   - "function" == typeof r && r(), a.app().confirmBox(e.data.msg);
69   - }
70   - });
71   - },
72   - sendBindSmsCode: function(e, t) {
73   - r = this;
74   - if (!e) return r.app().showWarning("手机号码不能为空");
75   - var r = this;
76   - this.app().request.post("/home/api/send_validate_code", {
77   - data: {
78   - mobile: e,
79   - scene: "1",
80   - type: "user_reg"
81   - },
82   - success: function(e) {
83   - "function" == typeof t && t(), r.app().confirmBox(e.data.msg);
84   - }
85   - });
86   - }
  48 +
  49 +
87 50 };
88 51 \ No newline at end of file
... ...
utils/phpSerializer.js deleted
View file @9bcee62
1   -// {{{ HTML_AJAX_Serialize_PHP
2   -/**
3   - * PHP serializer
4   - *
5   - * This class can be used to serialize and unserialize data in a
6   - * format compatible with PHP's native serialization functions.
7   - *
8   - * @version 0.0.3
9   - * @copyright 2005 Arpad Ray <arpad@php.net>
10   - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
11   - *
12   - * See Main.js for Author/license details
13   - */
14   -
15   -function utf16to8(str) {
16   - var out, i, len, c;
17   -
18   - out = "";
19   - len = str.length;
20   - for (i = 0; i < len; i++) {
21   - c = str.charCodeAt(i);
22   - if ((c >= 0x0001) && (c <= 0x007F)) {
23   - out += str.charAt(i);
24   - } else if (c > 0x07FF) {
25   - out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F));
26   - out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F));
27   - out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
28   - } else {
29   - out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F));
30   - out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
31   - }
32   - }
33   - return out;
34   -}
35   -
36   -function utf8to16(str) {
37   - var out, i, len, c;
38   - var char2, char3;
39   -
40   - out = "";
41   - len = str.length;
42   - i = 0;
43   - while (i < len) {
44   - c = str.charCodeAt(i++);
45   - switch (c >> 4) {
46   - case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
47   - // 0xxxxxxx
48   - out += str.charAt(i - 1);
49   - break;
50   - case 12: case 13:
51   - // 110x xxxx 10xx xxxx
52   - char2 = str.charCodeAt(i++);
53   - out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F));
54   - break;
55   - case 14:
56   - // 1110 xxxx 10xx xxxx 10xx xxxx
57   - char2 = str.charCodeAt(i++);
58   - char3 = str.charCodeAt(i++);
59   - out += String.fromCharCode(((c & 0x0F) << 12) |
60   - ((char2 & 0x3F) << 6) |
61   - ((char3 & 0x3F) << 0));
62   - break;
63   - }
64   - }
65   - return out;
66   -}
67   -
68   -
69   -function HTML_AJAX_Serialize_PHP() {}
70   -HTML_AJAX_Serialize_PHP.prototype = {
71   - error: false,
72   - message: "",
73   - cont: "",
74   - defaultEncoding: 'UTF-8',
75   - contentType: 'application/php-serialized; charset: UTF-8',
76   - // {{{ serialize
77   - /**
78   - * Serializes a variable
79   - *
80   - * @param mixed inp the variable to serialize
81   - * @return string a string representation of the input,
82   - * which can be reconstructed by unserialize()
83   - * @author Arpad Ray <arpad@rajeczy.com>
84   - * @author David Coallier <davidc@php.net>
85   - */
86   - serialize: function(inp) {
87   - var type = HTML_AJAX_Util.getType(inp);
88   - var val;
89   - switch (type) {
90   - case "undefined":
91   - val = "N";
92   - break;
93   - case "boolean":
94   - val = "b:" + (inp ? "1" : "0");
95   - break;
96   - case "number":
97   - val = (Math.round(inp) == inp ? "i" : "d") + ":" + inp;
98   - break;
99   - case "string":
100   - val = "s:" + inp.length + ":\"" + inp + "\"";
101   - break;
102   - case "array":
103   - val = "a";
104   - case "object":
105   - if (type == "object") {
106   - var objname = inp.constructor.toString().match(/(\w+)\(\)/);
107   - if (objname == undefined) {
108   - return;
109   - }
110   - objname[1] = this.serialize(objname[1]);
111   - val = "O" + objname[1].substring(1, objname[1].length - 1);
112   - }
113   - var count = 0;
114   - var vals = "";
115   - var okey;
116   - for (key in inp) {
117   - okey = (key.match(/^[0-9]+$/) ? parseInt(key) : key);
118   - vals += this.serialize(okey) +
119   - this.serialize(inp[key]);
120   - count++;
121   - }
122   - val += ":" + count + ":{" + vals + "}";
123   - break;
124   - }
125   - if (type != "object" && type != "array") val += ";";
126   - return val;
127   - },
128   - // }}}
129   - // {{{ unserialize
130   - /**
131   - * Reconstructs a serialized variable
132   - *
133   - * @param string inp the string to reconstruct
134   - * @return mixed the variable represented by the input string, or void on failure
135   - */
136   - unserialize: function(inp) {
137   - this.error = 0;
138   - if (inp == "" || inp.length < 2) {
139   - this.raiseError("input is too short");
140   - return;
141   - }
142   - var val, kret, vret, cval;
143   - var type = inp.charAt(0);
144   - var cont = inp.substring(2);
145   - var size = 0, divpos = 0, endcont = 0, rest = "", next = "";
146   -
147   - switch (type) {
148   - case "N": // null
149   - if (inp.charAt(1) != ";") {
150   - this.raiseError("missing ; for null", cont);
151   - }
152   - // leave val undefined
153   - rest = cont;
154   - break;
155   - case "b": // boolean
156   - if (!/[01];/.test(cont.substring(0,2))) {
157   - this.raiseError("value not 0 or 1, or missing ; for boolean", cont);
158   - }
159   - val = (cont.charAt(0) == "1");
160   - rest = cont.substring(1);
161   - break;
162   - case "s": // string
163   - val = "";
164   - divpos = cont.indexOf(":");
165   - if (divpos == -1) {
166   - this.raiseError("missing : for string", cont);
167   - break;
168   - }
169   - size = parseInt(cont.substring(0, divpos));
170   - if (size == 0) {
171   - if (cont.length - divpos < 4) {
172   - this.raiseError("string is too short", cont);
173   - break;
174   - }
175   - rest = cont.substring(divpos + 4);
176   - break;
177   - }
178   - if ((cont.length - divpos - size) < 4) {
179   - this.raiseError("string is too short", cont);
180   - break;
181   - }
182   - if (cont.substring(divpos + 2 + size, divpos + 4 + size) != "\";") {
183   - this.raiseError("string is too long, or missing \";", cont);
184   - }
185   - val = cont.substring(divpos + 2, divpos + 2 + size);
186   - rest = cont.substring(divpos + 4 + size);
187   - break;
188   - case "i": // integer
189   - case "d": // float
190   - var dotfound = 0;
191   - for (var i = 0; i < cont.length; i++) {
192   - cval = cont.charAt(i);
193   - if (isNaN(parseInt(cval)) && !(type == "d" && cval == "." && !dotfound++)) {
194   - endcont = i;
195   - break;
196   - }
197   - }
198   - if (!endcont || cont.charAt(endcont) != ";") {
199   - this.raiseError("missing or invalid value, or missing ; for int/float", cont);
200   - }
201   - val = cont.substring(0, endcont);
202   - val = (type == "i" ? parseInt(val) : parseFloat(val));
203   - rest = cont.substring(endcont + 1);
204   - break;
205   - case "a": // array
206   - if (cont.length < 4) {
207   - this.raiseError("array is too short", cont);
208   - return;
209   - }
210   - divpos = cont.indexOf(":", 1);
211   - if (divpos == -1) {
212   - this.raiseError("missing : for array", cont);
213   - return;
214   - }
215   - size = parseInt(cont.substring(0, divpos));
216   - cont = cont.substring(divpos + 2);
217   - val = new Array();
218   - if (cont.length < 1) {
219   - this.raiseError("array is too short", cont);
220   - return;
221   - }
222   - for (var i = 0; i < size; i++) {
223   - kret = this.unserialize(cont, 1);
224   - if (this.error || kret[0] == undefined || kret[1] == "") {
225   - this.raiseError("missing or invalid key, or missing value for array", cont);
226   - return;
227   - }
228   - vret = this.unserialize(kret[1], 1);
229   - if (this.error) {
230   - this.raiseError("invalid value for array", cont);
231   - return;
232   - }
233   - val[kret[0]] = vret[0];
234   - cont = vret[1];
235   - }
236   - if (cont.charAt(0) != "}") {
237   - this.raiseError("missing ending }, or too many values for array", cont);
238   - return;
239   - }
240   - rest = cont.substring(1);
241   - break;
242   - case "O": // object
243   - divpos = cont.indexOf(":");
244   - if (divpos == -1) {
245   - this.raiseError("missing : for object", cont);
246   - return;
247   - }
248   - size = parseInt(cont.substring(0, divpos));
249   - var objname = cont.substring(divpos + 2, divpos + 2 + size);
250   - if (cont.substring(divpos + 2 + size, divpos + 4 + size) != "\":") {
251   - this.raiseError("object name is too long, or missing \":", cont);
252   - return;
253   - }
254   - var objprops = this.unserialize("a:" + cont.substring(divpos + 4 + size), 1);
255   - if (this.error) {
256   - this.raiseError("invalid object properties", cont);
257   - return;
258   - }
259   - rest = objprops[1];
260   - var objout = "function " + objname + "(){";
261   - for (key in objprops[0]) {
262   - objout += "this." + key + "=objprops[0]['" + key + "'];";
263   - }
264   - objout += "}val=new " + objname + "();";
265   - eval(objout);
266   - break;
267   - default:
268   - this.raiseError("invalid input type", cont);
269   - }
270   - return (arguments.length == 1 ? val : [val, rest]);
271   - },
272   - // }}}
273   - // {{{ getError
274   - /**
275   - * Gets the last error message
276   - *
277   - * @return string the last error message from unserialize()
278   - */
279   - getError: function() {
280   - return this.message + "\n" + this.cont;
281   - },
282   - // }}}
283   - // {{{ raiseError
284   - /**
285   - * Raises an eror (called by unserialize().)
286   - *
287   - * @param string message the error message
288   - * @param string cont the remaining unserialized content
289   - */
290   - raiseError: function(message, cont) {
291   - this.error = 1;
292   - this.message = message;
293   - this.cont = cont;
294   - }
295   - // }}}
296   -}
297   -// }}}
298   -
utils/util.js
  View file @bfd4198
... ... @@ -689,7 +689,7 @@ module.exports = {
689 689 content: e.data.data.vipname+'邀请你登录成为会员？',
690 690 success: function (res) {
691 691 if (res.confirm) {
692   - getApp().goto("/pages/togoin/togoin");
  692 + getApp().goto("/packageE/pages/togoin/togoin");
693 693 }
694 694 }
695 695 })
... ...
utils/weapp-icon.wxss
  View file @bfd4198
... ... @@ -6,21 +6,9 @@
6 6 background-position: center;
7 7 background-size: 100%;
8 8 }
9   -
10   -
11   -
12 9 .t-icon-gowudai {
13 10 background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-gowudai%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M150.72-1.06666667l-5.86666667%20169.49333334%20738.13333334%2016.53333333L870.4-1.06666667z%22%20fill%3D%22%23cdcdcd%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M150.72-1.06666667l72.64%2049.38666667-78.50666667%20106.56z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M120.64%201025.70666667L69.33333333%20969.49333333h884.37333334l-54.29333334%2056.21333334z%22%20fill%3D%22%23bfbfbf%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M223.36%2047.36l-20.37333333%20113.38666667-103.57333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M870.4-1.06666667l-71.68%2049.38666667%2084.26666667%20108.48z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M798.72%2048.32l20.37333333%20112.42666667%20105.49333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M99.41333333%20152h825.17333334L954.66666667%20969.49333333H69.33333333z%22%20fill%3D%22%23dbdbdb%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20256.10666667H770.13333333v255.68c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20653.01333333%20258.66666667%20511.78666667V256.10666667h51.30666666v255.68c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V256.10666667z%22%20fill%3D%22%23A5A5A5%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20312.32H770.13333333v149.12c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20602.66666667%20258.66666667%20461.44V312.32h51.30666666v149.12c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V312.32z%22%20fill%3D%22%23FFFFFF%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
14 11 }
15   -
16   -/* .t-icon-liwu {
17   - background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-liwu%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M85.93%20950.016c0%2024.576%207.126%2031.317%2029.44%2031.317h353.366V511.744H85.931v438.272z%20m469.334%2031.317h353.365c22.358%200%2029.44-6.698%2029.44-31.317V511.744H555.221v469.59zM938.667%20256H725.333c51.499-11.733%20105.899-49.707%20112.598-94.293%207.85-50.859-52.566-127.958-125.654-118.187-87.424%2012.117-151.509%2089.259-196.736%20149.077C470.656%20133.931%20412.16%2065.408%20328.363%2045.483c-81.152-19.2-136.747%2064.938-135.254%20116.992%201.451%2044.245%2052.608%2081.834%20105.558%2093.525H85.333c-26.368%200-42.666%2014.848-42.666%2042.667v170.581l426.666%200.085V256h85.334v213.333l426.666-0.085V298.667c0-27.819-16.341-42.667-42.666-42.667z%20m-687.019-77.824c-14.763-16.427-4.779-38.741%204.48-55.595%2017.024-29.696%2040.747-47.744%2081.152-30.933%2056.32%2023.51%2097.792%2073.216%20131.584%20117.803-71.552%207.893-178.304%2010.965-217.216-31.275z%20m311.296%2030.507c34.816-44.63%2075.221-89.942%20131.157-117.803%2058.582-28.97%20113.024%2049.323%2085.206%2086.912-21.419%2028.544-89.259%2031.232-125.91%2032.853-30.08%201.536-60.501%200.811-90.453-1.962z%22%20fill%3D%22%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
18   -}
19   -
20   -.t-icon-echarts {
21   - background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-echarts%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M436.59925293%20533.33333333c0-65.04312613%2035.34952507-123.72333775%2088.37381267-153.41693881l-206.44122641-353.49525068c-282.79620057%20159.07286282-376.82593725%20518.22403753-217.75307443%20801.02023808l359.15117471-206.44122642c-11.31184801-22.62369604-23.33068654-52.31729711-23.33068654-87.66682217z%22%20fill%3D%22%23DADADA%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M613.34687829%20356.58570799c65.04312613%200%20123.72333775%2035.34952507%20153.41693879%2088.37381266l253.1025995-147.05402428C890.48715482%2073.78950741%20602.03503025-2.56546674%20377.91904132%20126.81379502l147.05402428%20253.1025995c24.03767705-11.31184801%2059.38720211-23.33068654%2088.37381269-23.33068653z%22%20fill%3D%22%23EBEBEB%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M701.72069095%20686.75027214c-23.33068654%2017.67476253-58.68021163%2023.33068654-88.37381266%2023.33068653-65.04312613%200-123.72333775-35.34952507-153.41693882-88.37381266L201.17141596%20775.12408481c41.00544908%2070.69905013%20100.3926512%20129.37926176%20171.09170135%20171.09170134%20153.41693881%2088.37381268%20335.82048816%2082.71788866%20477.21858844-5.65592402l-147.7610148-253.80958999z%22%20fill%3D%22%23B8B8B8%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M920.18075589%20356.58570799L766.76381708%20444.95952065c12.01883853%2029.69360106%2023.33068654%2058.68021163%2023.33068654%2088.37381268%200%2065.04312613-35.34952507%20123.72333775-88.37381267%20153.41693881l88.37381267%20153.41693881c171.09170134-100.3926512%20229.77191295-312.48980161%20130.08625227-483.58150296z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
22   -} */
23   -
24 12 .t-icon-sort-up {
25 13 background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-sort-up%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M-109.37837037-109.37837037h1242.75674074v1242.75674074H-109.37837037z%22%20fill%3D%22%23FFFFFF%22%20fill-opacity%3D%220%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M242.7360391%20615.56306132h538.5279218a20.71261275%2020.71261275%200%200%201%2016.57008947%2033.14018016l-269.2639609%20359.05313542a20.71261275%2020.71261275%200%200%201-33.14017894%200L226.16594963%20648.70324148A20.71261275%2020.71261275%200%200%201%20242.7360391%20615.56306132z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M528.57008947%2016.2436231l269.2639609%20359.05313542A20.71261275%2020.71261275%200%200%201%20781.2639609%20408.43693868H242.7360391a20.71261275%2020.71261275%200%200%201-16.57008947-33.14018016l269.2639609-359.05313542a20.71261275%2020.71261275%200%200%201%2033.14017894%200z%22%20fill%3D%22%235A5A5A%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
26 14 }
... ...