wxd / MShopWeApp

Commit 4380bac4bb7df9f3e047a511663e120d9f495aee

Authored by 后端研发-苏泰源
2 parents b80e6c00 7bf27aee

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

Inline Side-by-side
Showing 31 changed files with 322 additions and 700 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;
... ... @@ -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 1067 return parseFloat(parseFloat(first_money).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 @4380bac
... ... @@ -33,7 +33,6 @@
33 33 "pages/cart/cart_wk/cart_wk",
34 34  
35 35  
36   -
37 36 "pages/user/userqy/userqy",
38 37 "pages/user/user_spsy/user_spsy",
39 38 "pages/user/user_fw/user_fw",
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.js
  View file @4380bac
... ... @@ -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 @4380bac
... ... @@ -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>
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @4380bac
... ... @@ -630,7 +630,7 @@ Page({
630 630  
631 631 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
632 632  
633   - if (item['exp_sum_type'] == 2) {
  633 + if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
634 634 if (goods_weight < 0) goods_weight = 0;
635 635 goods_weight += item['weight'] * item['buynum'];
636 636 cut_good_weight += item['weight'] * item['buynum'];
... ...
packageC/pages/presell/cart/cart.js
  View file @4380bac
... ... @@ -1913,7 +1913,7 @@ Page({
1913 1913  
1914 1914 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
1915 1915  
1916   - if (item['exp_sum_type'] == 2) {
  1916 + if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
1917 1917 if (goods_weight < 0) goods_weight = 0;
1918 1918 goods_weight += item['weight'] * item['buynum'];
1919 1919 cut_good_weight += item['weight'] * item['buynum'];
... ...
packageC/pages/presell/cart/cart2.js
  View file @4380bac
... ... @@ -769,7 +769,7 @@ Page({
769 769  
770 770 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
771 771  
772   - if (item['exp_sum_type'] == 2) {
  772 + if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
773 773 if (goods_weight < 0) goods_weight = 0;
774 774 cut_good_weight += item['weight'] * item['buynum'];
775 775 goods_weight += item['weight'] * item['buynum'];
... ...
packageC/pages/presell/cart/cart2_pre.js
  View file @4380bac
... ... @@ -391,7 +391,7 @@ Page({
391 391 let item = data[i];
392 392  
393 393 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
394   - if (item['exp_sum_type'] == 2) {
  394 + if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
395 395 goods_weight += item['weight'] * item['buynum'];
396 396 cut_good_weight += item['weight'] * item['buynum'];
397 397 }
... ...
packageD/pages/user/coupons/coupons.js
  View file @4380bac
... ... @@ -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 * 点击"立即使用"
... ...
pages/cart/cart/cart.js
  View file @4380bac
... ... @@ -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 @4380bac
... ... @@ -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;
... ... @@ -2007,7 +1985,7 @@ Page({
2007 1985  
2008 1986 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) {
2009 1987  
2010   - if (item[j]['exp_sum_type'] == 2) {
  1988 + if (item[j]['exp_sum_type'] == 2 && back_data.weight_free>0) {
2011 1989 if (goods_weight < 0) goods_weight = 0;
2012 1990 cut_good_weight += item[j]['weight'] * item[j]['goods_num'];
2013 1991 goods_weight += item[j]['weight'] * item[j]['goods_num'];
... ... @@ -2533,7 +2511,7 @@ Page({
2533 2511  
2534 2512 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
2535 2513  
2536   - if (item['exp_sum_type'] == 2) {
  2514 + if (item['exp_sum_type'] == 2 && back_data.weight_free>0) {
2537 2515 if (goods_weight < 0) goods_weight = 0;
2538 2516 goods_weight += item['weight'] * item['buynum'];
2539 2517 cut_good_weight += item['weight'] * item['buynum'];
... ... @@ -2565,7 +2543,7 @@ Page({
2565 2543 case 3:
2566 2544 if (goods_piece < 0) goods_piece = 0;
2567 2545 //累积商品数量
2568   - goods_piece += item['buynum'];
  2546 + goods_piece += parseInt(item['buynum']) ;
2569 2547 break;
2570 2548 }
2571 2549 }
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @4380bac
... ... @@ -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 }
... ... @@ -525,7 +512,7 @@ Page({
525 512  
526 513 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1) ) {
527 514  
528   - if (item['exp_sum_type'] == 2) {
  515 + if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
529 516 if (goods_weight < 0) goods_weight = 0;
530 517 goods_weight += item['weight'] * item['buynum'];
531 518 cut_good_weight += item['weight'] * item['buynum'];
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @4380bac
... ... @@ -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;
... ... @@ -553,7 +542,7 @@ Page({
553 542  
554 543 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
555 544  
556   - if (item['exp_sum_type'] == 2) {
  545 + if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
557 546 if (goods_weight < 0) goods_weight = 0;
558 547 cut_good_weight += item['weight'] * item['buynum'];
559 548 goods_weight += item['weight'] * item['buynum'];
... ...
pages/cart/cart_wk/cart_wk.js
  View file @4380bac
... ... @@ -625,7 +625,7 @@ Page({
625 625  
626 626 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
627 627  
628   - if (item['exp_sum_type'] == 2) {
  628 + if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
629 629 if (goods_weight < 0) goods_weight = 0;
630 630 goods_weight += item['weight'] * item['buynum'];
631 631 cut_good_weight += item['weight'] * item['buynum'];
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @4380bac
... ... @@ -114,7 +114,7 @@ Page({
114 114 })
115 115  
116 116 if(!options.lbId && options.scene){
117   - var gid_str = decodeURIComponent(t.scene);
  117 + var gid_str = decodeURIComponent(options.scene);
118 118 gid_str = gid_str.split("_");
119 119  
120 120 options.lbId=gid_str[0];
... ... @@ -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
... ... @@ -1147,6 +1141,14 @@ Page({
1147 1141 savePic() {
1148 1142 getApp().savePic(this);
1149 1143 },
  1144 + // 预览海报
  1145 + previewPoster() {
  1146 + getApp().globalData.no_clear=1;
  1147 + wx.previewImage({
  1148 + current: this.data.shareImgPath, // 当前显示图片的http链接
  1149 + urls: [this.data.shareImgPath] ,// 需要预览的图片http链接列表
  1150 + });
  1151 + },
1150 1152  
1151 1153  
1152 1154  
... ...
pages/goods/categoryList/categoryList.js
  View file @4380bac
... ... @@ -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 @4380bac
... ... @@ -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 @4380bac
... ... @@ -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/goodsList/goodsList.js
  View file @4380bac
... ... @@ -333,7 +333,7 @@ Page({
333 333 await getApp().request.promiseGet(url, {}).then(res => {
334 334 var prom =null;
335 335 if(res && res.data) prom=res.data.data;
336   - if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
  336 + if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom_type!=2 && prom.show_time && prom.show_time<now)) ) {
337 337 item.prom_price = res.data.data.price;
338 338 if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
339 339 var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
... ... @@ -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/goods/search/search.js
  View file @4380bac
... ... @@ -285,7 +285,7 @@ Page({
285 285 if (res.data.code == 0 && res.data.data) {
286 286 prom = res.data.data;
287 287  
288   - if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) {
  288 + if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
289 289 item.prom_price = res.data.data.price;
290 290 if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
291 291 var vNum = prom.virtual_num ? prom.virtual_num : 0;
... ...
pages/index/index/full_screen.js
  View file @4380bac
... ... @@ -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.wxml
  View file @4380bac
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==0}}" 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 @4380bac
... ... @@ -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/store/index.js
  View file @4380bac
... ... @@ -15,10 +15,6 @@ Page({
15 15 islading:0,
16 16 },
17 17  
18   - onShow:function(){
19   -
20   - },
21   -
22 18 //调用视频接口
23 19 onLoad:function(e){
24 20 var th=this;
... ...
pages/team/team_success/team_success.js
  View file @4380bac
... ... @@ -323,7 +323,6 @@ Page({
323 323 ee.setData({is_pay_wk:1});
324 324 }
325 325 }else{
326   - console.log("239什么鬼", teamlist);
327 326 //设置值
328 327 ee.setData({
329 328 ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup,
... ... @@ -508,9 +507,7 @@ Page({
508 507 context.setFillStyle("black");
509 508  
510 509  
511   -
512   -
513   - th.draw_Text(context,share_title,
  510 + getApp().draw_Text(context,share_title,
514 511 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
515 512 //------产品的价格-------
516 513 context.setFontSize(24 * unit)
... ... @@ -728,34 +725,6 @@ Page({
728 725 },
729 726  
730 727  
731   - //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
732   - draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
733   - var lineWidth = 0;
734   - var lastSubStrIndex = 0; //每次开始截取的字符串的索引
735   - var han = 0;
736   - for (let i = 0; i < str.length; i++) {
737   - if (han == 2) return;
738   -
739   - //lineWidth += ctx.measureText(str[i]).width;
740   - lineWidth += ut.measureText(str[i], 21.3 * unit);
741   -
742   - if (lineWidth > canvasWidth) {
743   - han++;
744   - if (han == 2)
745   - ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分
746   - else
747   - ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight);
748   -
749   - initHeight += 22; //22为字体的高度
750   - lineWidth = 0;
751   - lastSubStrIndex = i;
752   - titleHeight += 20;
753   - }
754   - if (i == str.length - 1) { //绘制剩余部分
755   - ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight);
756   - }
757   - }
758   - },
759 728  
760 729 //c点击打开拼团弹窗
761 730 cpd: function() {
... ... @@ -906,101 +875,11 @@ Page({
906 875 // 保存图片到手机
907 876 savePic() {
908 877 console.log('保存图片');
909   - var self = this;
910   - // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
911   - this.getSetting().then((res) => {
912   - // 判断用户是否授权了保存到相册的权限，如果没有发起授权
913   - if (!res.authSetting['scope.writePhotosAlbum']) {
914   - this.authorize().then(() => {
915   - // 同意授权后保存下载文件
916   - this.saveImage(self.data.shareImgPath)
917   - .then(() => {
918   - self.setData({
919   - showPoster: false
920   - });
921   - });
922   - })
923   - } else {
924   - // 如果已经授权，保存下载文件
925   - this.saveImage(self.data.shareImgPath)
926   - .then(() => {
927   - self.setData({
928   - showPoster: false
929   - });
930   - });
931   - }
  878 + getApp().savePic(this);
932 879  
933   - })
934 880 },
935 881  
936 882  
937   - // 保存图片到系统相册
938   - saveImage(saveUrl) {
939   - var self = this;
940   - return new Promise((resolve, reject) => {
941   - wx.saveImageToPhotosAlbum({
942   - filePath: saveUrl,
943   - success: (res) => {
944   - wx.showToast({
945   - title: '保存成功',
946   - duration: 1000,
947   - });
948   - self.setData({
949   - showPlaybill: 'true'
950   - });
951   - resolve();
952   - },
953   - fail: () => {
954   - wx.showToast({
955   - title: '保存失败',
956   - duration: 1000,
957   - });
958   - }
959   - })
960   - })
961   - },
962   -
963   - // 获取用户已经授予了哪些权限
964   - getSetting() {
965   - return new Promise((resolve, reject) => {
966   - wx.getSetting({
967   - success: res => {
968   - resolve(res)
969   - }
970   - })
971   - })
972   - },
973   -
974   - // 发起首次授权请求
975   - authorize() {
976   - // isFirst 用来记录是否为首次发起授权，
977   - // 如果首次授权拒绝后，isFirst赋值为1
978   - let isFirst = wx.getStorageSync('isFirst') || 0;
979   - return new Promise((resolve, reject) => {
980   - wx.authorize({
981   - scope: 'scope.writePhotosAlbum',
982   - // 同意授权
983   - success: () => {
984   - resolve();
985   - },
986   - // 拒绝授权,这里是用户拒绝授权后的回调
987   - fail: res => {
988   - if(isFirst === 0) {
989   - wx.setStorageSync('isFirst', 1);
990   - wx.showToast({
991   - title: '保存失败',
992   - icon: 'none',
993   - duration: 1000
994   - })
995   - } else {
996   - this.showModal();
997   - }
998   - console.log('拒绝授权');
999   - reject();
1000   - }
1001   - })
1002   - })
1003   - },
1004 883  
1005 884  
1006 885  
... ...
pages/togoin/togoin.js
  View file @4380bac
... ... @@ -122,6 +122,14 @@ Page({
122 122 //把会员的信息存在内存
123 123 wx.setStorageSync("userinfo",e.data.data);
124 124  
  125 + //调用接口判断是不是会员
  126 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => {
  127 + if (res.data.code == 0) {
  128 + getApp().globalData.guide_id = res.data.data.id;
  129 + }
  130 + })
  131 +
  132 +
125 133 setTimeout(function () {
126 134 getApp().globalData.login_back=1;
127 135 wx.navigateBack({ delta: 1}) //返回上一页
... ... @@ -258,7 +266,15 @@ Page({
258 266 getApp().globalData.login_back=1;
259 267 wx.setStorageSync("userinfo",e.data.data);
260 268 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})
  269 +
  270 + //调用接口判断是不是会员
  271 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
  272 + if (res.data.code == 0) {
  273 + getApp().globalData.guide_id = res.data.data.id;
  274 + }
  275 + })
  276 +
  277 + wx.navigateBack({ delta: 1})
262 278  
263 279 },
264 280 failStatus: function (t) {
... ... @@ -321,6 +337,14 @@ Page({
321 337 //把会员的信息存在内存
322 338 wx.setStorageSync("userinfo",e.data.data);
323 339  
  340 + //调用接口判断是不是会员
  341 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
  342 + if (res.data.code == 0) {
  343 + getApp().globalData.guide_id = res.data.data.id;
  344 + }
  345 + })
  346 +
  347 +
324 348 setTimeout(function () {
325 349 getApp().globalData.login_back=1;
326 350 wx.navigateBack({ delta: 1}) //返回上一页
... ...
pages/user/index/index.js
  View file @4380bac
... ... @@ -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;
... ... @@ -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 /**
... ...
pages/user/index/index.wxml
  View file @4380bac
... ... @@ -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">
... ...
utils/common.js
  View file @4380bac
... ... @@ -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 @b80e6c0
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/weapp-icon.wxss
  View file @4380bac
... ... @@ -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 }
... ...