wxd / MShopWeApp

Merged
Merge Request #511 · created by 后端研发-苏明海

Test

From test into qa

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 28 changed files
app.js
  Edit  View file @dff3310
... ... @@ -5,131 +5,34 @@ var api = require("./api/api.js")
5 5  
6 6 //公共方法和变量
7 7 App({
8   - editTabBar: function (taht,stoid,url) {
9   - var that=this;
10   - var th = taht
11   - //使用getCurrentPages可以获取当前加载中所有的页面对象的一个数组，数组最后一个就是当前页面。
12   - var custum_data=this.globalData.custum_data;
13   - var isIpx=this.globalData.isIpx;
14   - var is_read=this.globalData.is_read;
15   - //var curPageArr = getCurrentPages(); //获取加载的页面
16   - //var curPage = curPageArr[curPageArr.length - 1]; //获取当前页面的对象
17   - var curPage=th;
18   - var pagePath = curPage.route; //当前页面url
19   - if (pagePath.indexOf('/') != 0) {
20   - pagePath = '/' + pagePath;
21   - }
22   - if(is_read){
23   - if(custum_data){
24   - that.set_custom_nav(custum_data,isIpx,pagePath,url,curPage);
25   - }else{
26   - var tabBar = {
27   - 'iscustom':2,
28   - 'url':url,
29   - 'active':pagePath,
30   - 'isIpx':isIpx,
31   - cartGoodsNum:this.globalData.cartGoodsNum
32   - }
33   - curPage.setData({
34   - tabBar:tabBar,
35   - isIpx:isIpx,
36   - cartGoodsNum:this.globalData.cartGoodsNum
37   - })
38   - }
39   -
40   - }else{
41   - var isIpx = false;
42   - wx.getSystemInfo({
43   - success: (res) => {
44   - // console.log(res)
45   - let modelmes = res.model; //手机品牌
46   - if (modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
47   - isIpx = true
48   - }
49   - //缓存住，下次就不调用接口了
50   - that.globalData.isIpx=isIpx;
51   - getApp().request.promiseGet("/api/weshop/storeFooter/get/"+stoid, {
52   - }).then(res => {
53   - this.globalData.is_read=true;
54   - var e = res;
55   - if(e.data.code != -1){
56   - that.globalData.custum_data=e.data.data;
57   -
58   - var itemList = that.globalData.custum_data.data;
59   - itemList = JSON.parse(itemList)
60   -
61   - if(!itemList[0].weappurl){
62   - that.globalData.custum_data=null;
63   - var tabBar = {
64   - 'iscustom':2,
65   - 'url':url,
66   - 'active':pagePath,
67   - 'isIpx':isIpx,
68   - cartGoodsNum:this.globalData.cartGoodsNum
69   - }
70   - curPage.setData({
71   - tabBar:tabBar,
72   - isIpx:isIpx,
73   - cartGoodsNum:this.globalData.cartGoodsNum
74   - })
75   - }else{
76   - that.set_custom_nav(e.data.data,isIpx,pagePath,url,curPage);
77   - }
78   -
79   - }else{
80   - var tabBar = {
81   - 'iscustom':2,
82   - 'url':url,
83   - 'active':pagePath,
84   - 'isIpx':isIpx,
85   - cartGoodsNum:this.globalData.cartGoodsNum
86   - }
87   - curPage.setData({
88   - tabBar:tabBar,
89   - isIpx:isIpx,
90   - cartGoodsNum:this.globalData.cartGoodsNum
91   - })
92   - }
93   -
94   - })
95   - },
96   - })
97   - }
98   -
99   -
100   - },
101   - set_custom_nav(data,isIpx,pagePath,url,curPage){
102   - //缓存住，下次就不调用接口了
103   - var itemList = data.data;
104   - itemList = JSON.parse(itemList)
105   - //使用getCurrentPages可以获取当前加载中所有的页面对象的一个数组，数组最后一个就是当前页面。
106   - for (var i = 0; i < itemList.length; i++) {
107   - itemList[i].active = false;
108   - if (itemList[i].weappurl == pagePath) {
109   - itemList[i].active = true; //根据页面地址设置当前页面状态
110   - }
111   - }
112   -
113   - //如果当服务端返回的值有数据就渲染数据到页面
114   - var tabBar = {
115   - 'iscustom':1,
116   - 'url':url,
117   - 'active':pagePath,
118   - 'list':itemList,
119   - 'backgroundColor': data.bkcolor,
120   - 'selectedColor' : data.fontcolor_sele,
121   - 'color':data.fontcolor,
122   - 'length':itemList.length,
123   - 'isIpx':isIpx,
124   - cartGoodsNum:this.globalData.cartGoodsNum
125   - }
126   - curPage.setData({
127   - tabBar:tabBar,
128   - isIpx:isIpx,
129   - cartGoodsNum:this.globalData.cartGoodsNum
130   - })
131   - },
132 8  
  9 + def_list:[
  10 + {
  11 + "weappurl": "pages/index/index/index",
  12 + "nav_name": "首页",
  13 + "src": t.imghost+"/miniapp/images/bar/index.png",
  14 + "src_sele": t.imghost+"/miniapp/images/bar/index_on.png",
  15 + },
  16 + {
  17 + "weappurl": "pages/goods/categoryList/categoryList",
  18 + "nav_name": "分类",
  19 + "src": t.imghost+"/miniapp/images/bar/fl.png",
  20 + "src_sele": t.imghost+"/miniapp/images/bar/fl_on.png"
  21 + },
  22 + {
  23 + "weappurl": "pages/cart/cart/cart",
  24 + "nav_name": "购物车",
  25 + "src": t.imghost+"/miniapp/images/bar/car.png",
  26 + "src_sele": t.imghost+"/miniapp/images/bar/car_on.png"
  27 + },
  28 + {
  29 + "weappurl": "pages/user/index/index",
  30 + "nav_name": "我的",
  31 + "src": t.imghost+"/miniapp/images/bar/user.png",
  32 + "src_sele": t.imghost+"/miniapp/images/bar/user_on.png"
  33 + }
  34 + ],
  35 +
133 36 globalData: {
134 37 cartGoodsNum:0, //购物车总数量
135 38 isTabBar :false,
... ... @@ -168,6 +71,7 @@ App({
168 71 auth: o,
169 72 request: a,
170 73 onLaunch: function() {
  74 + wx.hideTabBar();
171 75 this.initExt();
172 76 var t = this.globalData.setting;
173 77 //console.log(t)
... ... @@ -208,7 +112,6 @@ App({
208 112 console.log(t);
209 113 t.appName ? (o.appName = t.appName, o.stoid = t.stoid) : tt=1;
210 114  
211   -
212 115 },
213 116  
214 117 //首页的第一次登录
... ... @@ -433,13 +336,9 @@ App({
433 336 "/pages/cart/cart/cart","/pages/user/index/index"];
434 337 if(arr_tabbar.indexOf(url)!=-1){
435 338 if(url.indexOf("categoryList?type=1")!=-1) this.globalData.cat_type=1;
436   - if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;
437   - if (getCurrentPages().length > 9) {
438   - wx.redirectTo({url: url,}) //跳到tabbar页
439   - }else{
440   - wx.navigateTo({url: url,}) //跳到tabbar页
441   - }
442   -
  339 + if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;
  340 + wx.switchTab({url: url,}) //跳到tabbar页
  341 +
443 342 }else{
444 343 if (getCurrentPages().length > 9) {
445 344 wx.redirectTo({url: url,}) //跳到非tabbar页
... ... @@ -527,6 +426,7 @@ App({
527 426 requestCardNum: function(th) {
528 427 if(!this.globalData.user_id) return false;
529 428 this.request.get("/api/weshop/cart/page", {
  429 + isShoeLoading:false,
530 430 data: {
531 431 store_id: this.globalData.setting.stoid,
532 432 user_id: this.globalData.user_id,
... ... @@ -540,14 +440,13 @@ App({
540 440 num += e.data.data.pageData[i].goods_num;
541 441 }
542 442 }
543   -
544   -
  443 + getApp().globalData.cartGoodsNum=num;
545 444 /*---
546 445 wx.setTabBarBadge({ //tabbar右上角添加文本
547 446 index: 2, ////tabbar下标
548 447 text: '' + num //显示的内容
549 448 });--*/
550   - th.setData({['tabBar.cartGoodsNum']:num});
  449 + th.getTabBar().setData({cartGoodsNum:num});
551 450 }
552 451 });
553 452 },
... ... @@ -606,7 +505,39 @@ App({
606 505 str = str.replace(reg, '');
607 506 }
608 507 return str;
609   - }
  508 + },
  509 +
  510 + getPageIndex:function(curPage){
  511 +
  512 + var pagePath = curPage.route; //当前页面url
  513 + if (pagePath.indexOf('/') != 0) {
  514 + pagePath = '/' + pagePath;
  515 + }
  516 +
  517 + var index=0;
  518 +
  519 + if(this.globalData.custum_data){
  520 + var itemList = this.globalData.custum_data.data;
  521 + itemList = JSON.parse(itemList);
  522 + for(var i in itemList){
  523 + var item=itemList[i]
  524 + if(pagePath.indexOf(item.weappurl)!=-1){
  525 + index=i;break;
  526 + }
  527 + }
  528 +
  529 + }else{
  530 + var itemList=this.def_list;
  531 + for(var i in itemList){
  532 + var item=itemList[i]
  533 + if(pagePath.indexOf(item.weappurl)!=-1){
  534 + index=i;break;
  535 + }
  536 + }
  537 + }
  538 + return index;
  539 +
  540 + }
610 541  
611 542  
612 543 });
... ...
app.json
  Edit  View file @dff3310
... ... @@ -107,7 +107,6 @@
107 107 ]
108 108  
109 109 }],
110   -
111 110 "permission": {
112 111 "scope.userLocation": {
113 112 "desc": "获取你的位置信息"
... ... @@ -121,6 +120,48 @@
121 120 "backgroundColor": "#ffffff",
122 121 "enablePullDownRefresh": true
123 122 },
  123 +
  124 + "tabBar": {
  125 + "custom":true,
  126 + "color": "#6e6d6b",
  127 + "selectedColor": "#f23030",
  128 + "borderStyle": "white",
  129 + "backgroundColor": "#ffffff",
  130 + "list": [
  131 + {
  132 + "pagePath": "pages/index/index/index",
  133 + "text": "首页",
  134 + "iconPath": "packageA/images/bar/index.png",
  135 + "selectedIconPath": "packageA/images/bar/index_on.png"
  136 + },
  137 + {
  138 + "pagePath": "pages/goods/categoryList/categoryList",
  139 + "text": "分类",
  140 + "iconPath": "packageA/images/bar/fl.png",
  141 + "selectedIconPath": "packageA/images/bar/fl_on.png"
  142 + },
  143 + {
  144 + "pagePath": "pages/cart/cart/cart",
  145 + "text": "购物车",
  146 + "iconPath": "packageA/images/bar/car.png",
  147 + "selectedIconPath": "packageA/images/bar/car_on.png"
  148 + },
  149 + {
  150 + "pagePath": "pages/user/index/index",
  151 + "text": "我的",
  152 + "iconPath": "packageA/images/bar/user.png",
  153 + "selectedIconPath": "packageA/images/bar/user_on.png"
  154 + }
  155 + ]
  156 + },
  157 +
124 158 "debug": false,
125   - "sitemapLocation": "sitemap.json"
  159 + "sitemapLocation": "sitemap.json",
  160 + "usingComponents": {
  161 + "customtabbar":"custom-tab-bar/index"
  162 + }
  163 +
  164 +
  165 +
  166 +
126 167 }
127 168 \ No newline at end of file
... ...
app.wxss
  Edit  View file @dff3310
... ... @@ -162,6 +162,7 @@ justify-content:flex-start;
162 162 align-items:center;
163 163 }
164 164 .flex{display: flex}
  165 +
165 166 .ai-center{
166 167 align-items: center;
167 168 }
... ... @@ -407,4 +408,9 @@ background: #ffe3e2;
407 408 .fs60{ font-size:60rpx;}
408 409 .flex-wrap{
409 410 flex-wrap:wrap;
  411 +}
  412 +
  413 +
  414 +.lh1 {
  415 + line-height: 1;
410 416 }
411 417 \ No newline at end of file
... ...
components/diy_goodsGroup/diy_goodsGroup.js
  Edit  View file @dff3310
... ... @@ -41,34 +41,63 @@ Component({
41 41 goodscount: null,
42 42 firist_type_data: null,
43 43 firist_type_curr: 0,
  44 + is_nav:0,
  45 + nav_list:null,
  46 + title_index:0,
  47 + swiper_hei:0,
44 48 },
45 49  
46   - ready: function () {
47   -
48   - },
49   -
50   -
  50 + ready: function () {},
  51 +
51 52 lifetimes: {
52   - attached: function() {
  53 + attached: function() {
  54 +
  55 + //要兼容性的写法，因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法
  56 + var nav_item=this.data.object;
  57 + var nav_list= this.data.object.nav_list;
  58 + //最新的版本才有nav_list
  59 + if(nav_list){
  60 + nav_item=nav_list[0];
  61 + //要算一下商品goodsid
  62 + for(var ij in nav_list){
  63 + var item=nav_list[ij];
  64 + var idlist="";
  65 + //如果商品有手动选择的时候
  66 + if(item.data && item.data.length>0){
  67 + for(var im in item.data){
  68 + idlist+= item.data[im]+",";
  69 + }
  70 + }
  71 + if(idlist) idlist=ut.sub_last(idlist);
  72 + nav_list[ij].idlist=idlist;
  73 + }
  74 + this.setData({nav_list:nav_list,is_nav:parseInt(this.data.object.is_nav)});
  75 + }
  76 +
53 77 // 在组件实例进入页面节点树时执行
54   - this.data.classstyle_id = this.data.object.classstyle;
  78 + this.data.classstyle_id = nav_item.classstyle;
55 79 this.data.goodscount = this.data.object.goodscount;
56   - this.data.wgroup = this.data.object.wgroup;
57   -
58   - this.setData({
59   - classstyle_id: this.data.object.classstyle
60   - })
61   - if (this.data.object.goodsclass == 1) {
  80 + this.data.wgroup =nav_item.wgroup;
  81 +
  82 + var hei=280;
  83 + if(this.data.object.goodstit) hei+=80;
  84 + if(this.data.object.goodsprice) hei+=80;
  85 + if(this.data.object.goodsnum) hei+=80;
  86 +
  87 + this.setData({swiper_hei:hei});
  88 +
  89 + if (nav_item.goodsclass == 1) {
62 90 this.data.is_recommend = 1
63 91 }
64   - if (this.data.object.goodsclass == 2) {
  92 + if (nav_item.goodsclass == 2) {
65 93 this.data.is_hot = 1
66 94 }
67   - if (this.data.object.goodsclass == 3) {
  95 + if (nav_item.goodsclass == 3) {
68 96 this.data.is_new = 1
69 97 }
  98 +
70 99 this.data.requestData = new Array();
71   - this.data.g_id = this.data.object.data;
  100 + this.data.g_id = nav_item.data;
72 101 var arr = [];
73 102  
74 103 for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
... ... @@ -111,7 +140,6 @@ Component({
111 140 var os=getApp().globalData.setting;
112 141 classstyle_id = classstyle_id + "";
113 142 switch (classstyle_id) {
114   -
115 143 //---手动选择商品---
116 144 case "1":
117 145 var str="";
... ... @@ -120,8 +148,9 @@ Component({
120 148 }
121 149 str=str.substring(0, str.length - 1);
122 150 app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str, {
  151 + isShowLoading:false,
123 152 success: function(res) {
124   - console.log("121212");
  153 +
125 154 if(res.data.code==0 && res.data.data){
126 155 var rData = th.data.requestData;
127 156 if (rData == null) rData=[];
... ... @@ -137,7 +166,18 @@ Component({
137 166 }
138 167 rData = rData.concat(new_arr);
139 168 th.data.requestData = rData;
140   - th.setData({ goods_array: rData });
  169 +
  170 + if(th.data.object.column==5){
  171 + var arr = new Array();
  172 + //--三个三个一组---
  173 + for(var i=0;i< rData.length;i+=3){
  174 + arr.push(rData.slice(i,i+3));
  175 + }
  176 + th.setData({ goods_array: arr });
  177 + }else{
  178 + th.setData({ goods_array: rData });
  179 + }
  180 +
141 181 //---控制有没有加载更多的按钮---
142 182 if (th.data.firist_type_curr == th.data.firist_type_data.length) {th.setData({ goods_btn: [] }); }
143 183 else th.setData({ goods_btn: res.data});
... ... @@ -169,60 +209,8 @@ Component({
169 209 total: res.data.data.total
170 210 })
171 211 th.data.currentPage++;
172   - var now=ut.gettimestamp();
173   -
174   - goods.forEach(async function (val, ind) {
175   - var item = {};
176   - var prom_id = null;
177   - console.log(val.goodsid);
178   - //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
179   - //商品地址
180   - //var goods = res.data.data;
181   -
182   - item.goods_name = val.goods_name;
183   - item.goods_img = th.data.imghost + val.original_img;
184   - item.market_price = val.market_price;
185   - item.shop_price = val.shop_price;
186   - item.sales_sum = val.sales_sum;
187   - item.goods_id = val.goods_id;
188   -
189   - item.cardprice1 = val.cardprice1;
190   - item.cardprice2 = val.cardprice2;
191   - item.cardprice3 = val.cardprice3;
192   -
193   - prom_id = val.prom_id;
194   -
195   - var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单
196   -
197   - var url = "";
198   - if (prom_type == 6) {
199   - url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
200   - } else if (prom_type == 1) {
201   - url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
202   - }
203   - if(url!="") {
204   - await app.request.promiseGet(url, {}).then(res => {
205   - var prom = null
206   - if (res && res.data) prom=res.data.data;
207   - if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
208   - item.prom_price = res.data.data.price;
209   - }
210   - th.data.requestData.push(item);
211   - th.setData({
212   - goods_array: th.data.requestData,
213   - page: th.data.currentPage - 1,
214   - });
215   - })
216   - }else{
217   - th.data.requestData.push(item);
218   - th.setData({
219   - goods_array: th.data.requestData,
220   - page: th.data.currentPage - 1,
221   - });
222   - }
223   -
224   -
225   - })
  212 + //设置商品熏染
  213 + th.set_good(goods);
226 214  
227 215 })
228 216 break;
... ... @@ -243,60 +231,10 @@ Component({
243 231 goods_btn: res.data.data.pageData, total: res.data.data.total
244 232 })
245 233  
246   - th.data.currentPage++;
247   - var now=ut.gettimestamp();
248   - goods.forEach(async function (val, ind) {
249   - var item = {};
250   - var prom_id = null;
251   - console.log(val.goodsid);
252   - //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
253   - //商品地址
254   - var goods = res.data.data;
255   -
256   - item.goods_name = val.goods_name;
257   - item.goods_img = th.data.imghost + val.original_img;
258   - item.market_price = val.market_price;
259   - item.shop_price = val.shop_price;
260   - item.sales_sum = val.sales_sum;
261   - item.goods_id = val.goods_id;
262   -
263   - item.cardprice1 = val.cardprice1;
264   - item.cardprice2 = val.cardprice2;
265   - item.cardprice3 = val.cardprice3;
266   -
267   - prom_id = val.prom_id;
268   -
269   - var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单
270   -
271   - var url = "";
272   - if (prom_type == 6) {
273   - url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
274   - } else if (prom_type == 1) {
275   - url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
276   - }
277   -
278   - if(url!=null){
279   - await app.request.promiseGet(url, {}).then(res => {
280   - var prom =null;
281   - if(res && res.data) res.data.data;
282   - if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
283   - item.prom_price = res.data.data.price;
284   - }
285   - th.data.requestData.push(item);
286   - th.setData({
287   - goods_array: th.data.requestData,
288   - page: th.data.currentPage - 1,
289   - });
290   - })
291   - }else{
292   - th.data.requestData.push(item);
293   - th.setData({
294   - goods_array: th.data.requestData,
295   - page: th.data.currentPage - 1,
296   - });
297   - }
298   - })
299   -
  234 + th.data.currentPage++;
  235 + //设置商品熏染
  236 + th.set_good(goods);
  237 +
300 238 })
301 239 break;
302 240 }
... ... @@ -319,6 +257,7 @@ Component({
319 257 card_init: function() {
320 258 var th = this,os=getApp().globalData.setting;
321 259 getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
  260 + isShowLoading:false,
322 261 success: function(e) {
323 262 getApp().globalData.userInfo = e.data.data;
324 263 getApp().getConfig2(function(e) {
... ... @@ -390,6 +329,112 @@ Component({
390 329 })
391 330 },
392 331  
  332 + //--- 点击tab的事件 ---
  333 + gr_set_nav:function(e){
  334 +
  335 + var title_idx=e.currentTarget.dataset.index;
  336 + if(title_idx==this.data.title_index) return false;
  337 + wx.showLoading();
  338 +
  339 + var nav_item=this.data.object.nav_list[title_idx];
  340 +
  341 + this.data.g_id = this.data.object.nav_list[title_idx].data;
  342 + var arr = [];
  343 + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
  344 + arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
  345 + }
  346 + this.data.firist_type_data = arr;
  347 + this.data.firist_type_curr=0;
  348 + this.data.requestData=[];
  349 +
  350 + // 在组件实例进入页面节点树时执行
  351 + this.data.classstyle_id = nav_item.classstyle;
  352 + this.data.wgroup =nav_item.wgroup;
  353 +
  354 + this.data.is_recommend = this.data.is_hot=this.data.is_new=0;
  355 + //推荐，热卖，新品
  356 + if (nav_item.goodsclass == 1) {
  357 + this.data.is_recommend = 1
  358 + }
  359 + if (nav_item.goodsclass == 2) {
  360 + this.data.is_hot = 1
  361 + }
  362 + if (nav_item.goodsclass == 3) {
  363 + this.data.is_new = 1
  364 + }
  365 +
  366 +
  367 + this.data.currentPage=1;
  368 + this.setData({goods_array:null,total:null,title_index:title_idx});
  369 + //初始化
  370 + this.init(this.data.classstyle_id, this.data.wgroup);
  371 + setTimeout(function(){ wx.hideLoading();},1000)
  372 + },
  373 +
  374 + //--- 设置 ---
  375 + set_good:async function(goods){
  376 + var now=ut.gettimestamp();
  377 + var th=this;
  378 + for(var i in goods){
  379 + var val=goods[i];
  380 + var item = {};
  381 + var prom_id = null;
  382 + console.log(val.goodsid);
  383 + //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
  384 +
  385 + item.goods_name = val.goods_name;
  386 + item.goods_img = th.data.imghost + val.original_img;
  387 + item.market_price = val.market_price;
  388 + item.shop_price = val.shop_price;
  389 + item.sales_sum = val.sales_sum;
  390 + item.goods_id = val.goods_id;
  391 +
  392 + item.cardprice1 = val.cardprice1;
  393 + item.cardprice2 = val.cardprice2;
  394 + item.cardprice3 = val.cardprice3;
  395 +
  396 + prom_id = val.prom_id;
  397 +
  398 + var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单
  399 +
  400 + var url = "";
  401 + if (prom_type == 6) {
  402 + url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
  403 + } else if (prom_type == 1) {
  404 + url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
  405 + }
  406 +
  407 + if(url!=null){
  408 + await getApp().request.promiseGet(url, {}).then(res => {
  409 + var prom =null;
  410 + if(res && res.data) res.data.data;
  411 + if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
  412 + item.prom_price = res.data.data.price;
  413 + }
  414 + th.data.requestData.push(item);
  415 +
  416 + })
  417 + }else{
  418 + th.data.requestData.push(item);
  419 + }
  420 + }
  421 +
  422 + if(th.data.object.column==5){
  423 + var arr = new Array();
  424 + var rData=th.data.requestData;
  425 + //--三个三个一组---
  426 + for(var i=0;i< rData.length;i+=3){
  427 + arr.push(rData.slice(i,i+3));
  428 + }
  429 + th.setData({ goods_array: arr,page: th.data.currentPage - 1, });
  430 + }else{
  431 + th.setData({
  432 + goods_array: th.data.requestData,
  433 + page: th.data.currentPage - 1,
  434 + });
  435 + }
  436 +
  437 + }
393 438  
394 439 }
395 440 })
396 441 \ No newline at end of file
... ...
components/diy_goodsGroup/diy_goodsGroup.wxml
  Edit  View file @dff3310
1 1 <!--pages/diy_zs/diy_zs.wxml-->
2 2 <wxs module="filter" src="../../utils/filter.wxs"></wxs>
3 3 <wxs module="g_filter" src="g_filter.wxs"></wxs>
  4 +
  5 +<!-- 要不要顶部标题 -->
  6 +<block wx:if="{{is_nav}}">
  7 + <view class="flex gr_title_list" style="overflow-x: auto;">
  8 + <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" >
  9 + <text class="{{index==title_index?'t_red':''}}">{{item.title}}</text>
  10 + </view>
  11 + </view>
  12 +</block>
  13 +
4 14 <!--1个列表的时候-->
5 15 <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
6 16 <block wx:for="{{goods_array}}" >
7   - <view class='zs_goods'>
  17 + <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
8 18 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
9 19 <view class='zs_top rel'>
10 20 <image class='zs_t_img' src="{{item.goods_img}}"
... ... @@ -49,7 +59,10 @@
49 59 <view class="flex xc-wc ai_and">
50 60 <view class="fs24 wz_red">￥</view>
51 61 <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
52   - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
  62 + <view class="card_bg ellipsis-1">
  63 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  64 + <text class="card_name">{{card_name}}</text>
  65 + </view>
53 66 </view>
54 67 </view>
55 68 <view class="flex" style="line-height: 28rpx;" >
... ... @@ -98,7 +111,10 @@
98 111 <view class="price flex ai_and">
99 112 <view class="fs22">￥</view>
100 113 <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
101   - <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
  114 + <view class="card_bg ellipsis-1">
  115 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  116 + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
  117 + </view>
102 118 </view>
103 119 </view>
104 120 </block>
... ... @@ -142,7 +158,7 @@
142 158 <block wx:if="{{object.column==2}}">
143 159 <block wx:for="{{goods_array}}" >
144 160 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
145   - <view class="zs_goods_wai_ban">
  161 + <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
146 162 <view class="zs_goods_ban">
147 163 <view class='zs_goods_2l'>
148 164 <view class='zs_top_2l rel'>
... ... @@ -186,7 +202,10 @@
186 202 <view class="flex xc-wc ai_and">
187 203 <view class="fs24 wz_red">￥</view>
188 204 <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
189   - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
  205 + <view class="card_bg ellipsis-1">
  206 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  207 + <view class="card_name">{{card_name}}</view>
  208 + </view>
190 209 </view>
191 210 </view>
192 211 <view class="flex" style="line-height: 28rpx;" >
... ... @@ -235,7 +254,10 @@
235 254 <view class="price flex ai_and">
236 255 <view class="fs22">￥</view>
237 256 <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
238   - <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
  257 + <view class="card_bg ellipsis-1">
  258 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  259 + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
  260 + </view>
239 261 </view>
240 262 </view>
241 263 </block>
... ... @@ -281,7 +303,7 @@
281 303 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
282 304 <view class="zs_goods_wai_san" >
283 305 <view class="zs_goods_san">
284   - <view class='zs_goods_3l'>
  306 + <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'>
285 307 <view class='zs_top_3l rel'>
286 308 <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
287 309 binderror="bind_bnerr3"></image>
... ... @@ -323,7 +345,10 @@
323 345 <view class="flex xc-wc ai_and">
324 346 <view class="fs24 wz_red">￥</view>
325 347 <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
326   - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
  348 + <view class="card_bg ellipsis-1">
  349 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  350 + <text class="card_name">{{card_name}}</text>
  351 + </view>
327 352 </view>
328 353 </view>
329 354 <view class="flex" style="line-height: 28rpx;" >
... ... @@ -372,7 +397,10 @@
372 397 <view class="price flex ai_and">
373 398 <view class="fs22">￥</view>
374 399 <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
375   - <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
  400 + <view class="card_bg ellipsis-1">
  401 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  402 + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
  403 + </view>
376 404 </view>
377 405 </view>
378 406 </block>
... ... @@ -412,7 +440,7 @@
412 440 <view class="clear"></view>
413 441 </block>
414 442 <!-- 列表显示 -->
415   -<view class="zs_goods_xiao_wai" wx:if='{{object.column==4 }}'>
  443 +<view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
416 444 <block wx:for="{{goods_array}}" >
417 445 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
418 446 <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
... ... @@ -455,7 +483,10 @@
455 483 <view class="flex xc-wc ai_and">
456 484 <view class="fs24 wz_red">￥</view>
457 485 <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
458   - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
  486 + <view class="card_bg ellipsis-1">
  487 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  488 + <text class="card_name">{{card_name}}</text>
  489 + </view>
459 490 </view>
460 491 </view>
461 492 <view class="flex" style="line-height: 28rpx;" >
... ... @@ -504,7 +535,8 @@
504 535 <view class="price flex ai_and">
505 536 <view class="fs22">￥</view>
506 537 <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
507   - <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
  538 + <view class="card_bg">
  539 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
508 540 </view>
509 541 </view>
510 542 </block>
... ... @@ -540,7 +572,8 @@
540 572 </block>
541 573 <view class="clear"></view>
542 574 </view>
543   -
  575 +<!-- 商品的显示不是左右 -->
  576 +<block wx:if="{{object.column!=5}}">
544 577 <block wx:if="{{object.classstyle=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
545 578 <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
546 579 {{loadText}}
... ... @@ -550,4 +583,151 @@
550 583 <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
551 584 <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button>
552 585 </view>
553   -</block>
554 586 \ No newline at end of file
  587 +</block>
  588 +</block>
  589 +
  590 +
  591 +<!--商品展示-->
  592 + <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;">
  593 + <view class="sp">
  594 + <swiper-item class="s_it" wx:for="{{goods_array}}">
  595 + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
  596 + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" >
  597 + <view class='one'>
  598 + <view class='sp_top'>
  599 + <view class='s_img' style="position: relative;">
  600 + <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image>
  601 +
  602 + <block wx:if="{{object.goodicon==3}}">
  603 + <image class='{{g_filter.get_class(object.column,object.position)}}'
  604 + src='{{object.customicon}}'></image>
  605 + </block>
  606 + <block wx:if="{{object.goodicon==1}}">
  607 + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
  608 + </block>
  609 + <block wx:if="{{object.goodicon==2}}">
  610 + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
  611 + src='{{imghost}}/miniapp/images/Recommend.png'></image>
  612 + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
  613 + src='{{imghost}}/miniapp/images/hot.png'></image>
  614 + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
  615 + src='{{imghost}}/miniapp/images/new.png'></image>
  616 + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
  617 + src='{{imghost}}/miniapp/images/Promotion.png'></image>
  618 + </block>
  619 +
  620 + </view>
  621 + <view class='clear'></view>
  622 + </view>
  623 +
  624 + <view class='sp_wz'>
  625 + <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{aitem.goods_name}}</view>
  626 + <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
  627 + <block wx:if="{{aitem.prom_price}}">
  628 + <view class='wz_red'>￥{{aitem.prom_price}}</view>
  629 + <view class='del'>￥{{aitem.market_price}}</view>
  630 + </block>
  631 + <block wx:else>
  632 + <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}" >
  633 + <!-- 当会员是等级卡的时候 -->
  634 + <block wx:if="{{card_field}}">
  635 + <!-- 等级价>0 -->
  636 + <block wx:if="{{aitem[card_field]>0}}">
  637 + <view class="money flex" >
  638 + <!-- 办卡价 -->
  639 + <view class="flex xc-wc ai_and">
  640 + <view class="fs24 wz_red">￥</view>
  641 + <view class="fs35 wz_red">{{filter.toFix(aitem[card_field],2)}}</view>
  642 + <view class="card_bg ellipsis-1">
  643 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  644 + <text class="card_name">{{card_name}}</text>
  645 + </view>
  646 + </view>
  647 + </view>
  648 + <view class="flex" style="line-height: 28rpx;" >
  649 + <!-- 原价 -->
  650 + <view class="price flex xc-ash line_th">
  651 + <view class="fs22">￥</view>
  652 + <view class="fs22">{{aitem.market_price}}</view>
  653 + </view>
  654 + </view>
  655 + </block>
  656 + <blocK wx:else>
  657 + <view class="money flex" >
  658 + <!-- 办卡价 -->
  659 + <view class="flex xc-wc">
  660 + <view class="fs24 wz_red">￥</view>
  661 + <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
  662 + </view>
  663 + </view>
  664 + <view class="flex" style="line-height: 28rpx;" >
  665 + <!-- 原价 -->
  666 + <view class="price flex xc-ash line_th">
  667 + <view class="fs22">￥</view>
  668 + <view class="fs22">{{aitem.market_price}}</view>
  669 + </view>
  670 + </view>
  671 + </blocK>
  672 + </block>
  673 + <block wx:else>
  674 + <!-- 如果商品有设置等级价大于0的 -->
  675 + <block wx:if="{{g_filter.get_card_price(aitem,card_list,0)}}">
  676 + <view class="money flex" >
  677 + <!-- 办卡价 -->
  678 + <view class="flex xc-wc">
  679 + <view class="fs24 wz_red">￥</view>
  680 + <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
  681 + </view>
  682 + <!-- 原价 -->
  683 + <view class="price flex xc-ash line_th">
  684 + <view class="fs22">￥</view>
  685 + <view class="fs22">{{aitem.market_price}}</view>
  686 + </view>
  687 +
  688 + </view>
  689 + <view class="flex" style="line-height: 28rpx;" >
  690 + <!-- 等级价 -->
  691 + <view class="price flex ai_and">
  692 + <view class="fs22">￥</view>
  693 + <view class="fs28">{{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}</view>
  694 + <view class="card_bg ellipsis-1">
  695 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  696 + <text class="card_name">{{g_filter.get_card_price(aitem,card_list,1)}}</text>
  697 + </view>
  698 + </view>
  699 + </view>
  700 + </block>
  701 + <block wx:else>
  702 + <view class="money flex" >
  703 + <!-- 办卡价 -->
  704 + <view class="flex xc-wc">
  705 + <view class="fs24 wz_red">￥</view>
  706 + <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
  707 + </view>
  708 + </view>
  709 + <view class="flex" style="line-height: 28rpx;" >
  710 + <!-- 原价 -->
  711 + <view class="price flex xc-ash line_th">
  712 + <view class="fs22">￥</view>
  713 + <view class="fs22">{{aitem.market_price}}</view>
  714 + </view>
  715 + </view>
  716 + </block>
  717 + </block>
  718 + </block>
  719 + <block wx:else>
  720 + <view class='wz_red'>￥{{aitem.shop_price}}</view>
  721 + <view class='del'>￥{{aitem.market_price}}</view>
  722 + </block>
  723 + </block>
  724 + </view>
  725 + <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view>
  726 + <view style="height: 10rpx;"></view>
  727 + </view>
  728 +
  729 + </view>
  730 + </navigator>
  731 + </block>
  732 + </swiper-item>
  733 + </view>
  734 + </swiper>
555 735 \ No newline at end of file
... ...
components/diy_goodsGroup/diy_goodsGroup.wxss
  Edit  View file @dff3310
... ... @@ -6,9 +6,9 @@
6 6  
7 7 .zs_goods {
8 8 width: 700rpx;
9   - border: 1rpx #ddd solid;
10 9 margin-bottom: 10rpx;
11 10 margin: 0 auto;
  11 + overflow:hidden
12 12 }
13 13  
14 14 .s1_gk_a1 {
... ... @@ -258,16 +258,16 @@
258 258 .zs_goods_wai_ban {
259 259 display: flex;
260 260 /* padding-left: 2rpx; */
261   - margin-bottom: 12rpx;
  261 + /* margin-bottom: 12rpx; */
262 262 width: 48%;
263 263 float: left;
264 264 background: #fff;
265 265 margin-left: 1%;
266   - border:1rpx solid rgb(214, 214, 214);
267   - border-radius: 25rpx;
268 266 margin-top: 10rpx;
269 267 }
270 268  
  269 +
  270 +
271 271 .zs_goods_2l {
272 272 width: 94%;
273 273 min-height: 300rpx;
... ... @@ -284,6 +284,7 @@
284 284 .button-wrapper button {
285 285 /*width: 94%;*/
286 286 border: none;
  287 + margin-top: 10rpx;
287 288 }
288 289  
289 290 .zs_t_img_2l {
... ... @@ -389,6 +390,7 @@
389 390 float: left;
390 391 margin-bottom: 8rpx;
391 392 background-color: white;
  393 + overflow: hidden;
392 394 }
393 395  
394 396 .zs_goods_san {
... ... @@ -396,11 +398,11 @@
396 398 }
397 399  
398 400 .zs_goods_3l {
399   - width: 236rpx;
  401 + width: 228rpx;
400 402 min-height: 300rpx;
401   - border: 2rpx #ddd solid;
402 403 margin: 0 auto;
403 404 padding: 2rpx;
  405 + overflow: hidden;
404 406 }
405 407  
406 408 .zs_top_3l {
... ... @@ -417,7 +419,6 @@
417 419  
418 420 .zs_center_3l {
419 421 width: 100%;
420   - min-height: 200rpx;
421 422 font-size: 28rpx;
422 423 color: #333;
423 424 text-align: left;
... ... @@ -570,4 +571,241 @@
570 571 white-space: nowrap;
571 572 }
572 573  
  574 +.ai-center{align-items: center;}
  575 +
  576 +.gr_title_list{ width:95%; margin-left:2.5%}
  577 +.gr_title_item{ padding:0 10rpx;flex-shrink: 0;flex-grow: 1; text-align: center;}
  578 +
  579 +
  580 +.border_zhijiao{
  581 + border:1rpx solid rgb(214, 214, 214);
  582 +}
  583 +.border_yuanjiao{
  584 + border:1rpx solid rgb(214, 214, 214);
  585 + border-radius: 25rpx;
  586 +}
  587 +.top {
  588 + background-color: white;
  589 + height: 70rpx;
  590 + line-height: 70rpx;
  591 + color: #000;
  592 + border-bottom: 2rpx solid #eee;
  593 + padding:0rpx 20rpx;
  594 + display: flex;
  595 + justify-content: space-between;
  596 + font-size: 32rpx;
  597 +}
  598 +
  599 +.s_it {
  600 + width: 100%;
  601 + display: flex;
  602 + background-color: white;
  603 +}
  604 +
  605 +.s_prom {
  606 + width: 100%;
  607 + background-color: white;
  608 +}
  609 +
  610 +swiper {
  611 + display: block;
  612 +}
  613 +
  614 +.right_k {
  615 + width: 30rpx;
  616 +}
  617 +.right_k image{
  618 + width: 30rpx;
  619 + height: 30rpx;
  620 +}
  621 + .t_left {
  622 + width: 10rpx;
  623 + height: 38rpx;
  624 + background: #c4182e;
  625 + margin-right: 10rpx;
  626 +}
  627 +
  628 +
  629 +.sp {
  630 + width: 100%;
  631 + background-color: white;
  632 + padding: 18rpx;
  633 + display: flex;
  634 +}
  635 +
  636 +.sp .sp_top {
  637 + height: 220rpx;
  638 + min-width: 30%;
  639 +}
  640 +
  641 +.sp .sp_top .s_img {
  642 + width: 210rpx;
  643 + height: 100%;
  644 +}
  645 +
  646 +.sp .sp_top .s_img image {
  647 + width: 210rpx;
  648 + height: 100%;
  649 + position: relative;
  650 +}
  651 +
  652 +.sp .sp_top .s_top_kill {
  653 + background-color: #c4182e;
  654 + font-size: 24rpx;
  655 + height: 38rpx;
  656 + line-height: 38rpx;
  657 + left: 6rpx;
  658 + padding: 4rpx 10rpx;
  659 + border-radius: 10rpx;
  660 + z-index: 999;
  661 + position: relative;
  662 + top: -6rpx;
  663 + width: 210rpx;
  664 + color: #fff;
  665 + text-align: center;
  666 +}
  667 +
  668 +.po {
  669 + position: absolute;
  670 +}
  671 +
  672 +.sp .sp_top .s_foot_kill {
  673 + font-size: 20rpx;
  674 + position: relative;
  675 + top: -90rpx;
  676 + width: 210rpx;
  677 + height: 38rpx;
  678 + line-height: 38rpx;
  679 + color: #fff;
  680 + text-align: center;
  681 + background-color: rgba(0, 0, 0, 0.5);
  682 +}
  683 +
  684 +.sp_wz {
  685 + width: 210rpx;
  686 +}
  687 +
  688 +.sp_wz .sp_wzi {
  689 + font-size: 30rpx;
  690 + border-bottom: 2rpx solid #dcdcdc;
  691 + width: 100%;
  692 + text-align: left;
  693 + padding: 4rpx 0;
  694 + overflow: hidden;
  695 + height: 48rpx;
  696 + text-overflow: ellipsis;
  697 + white-space: nowrap;
  698 + line-height: 48rpx;
  699 +}
  700 +
  701 +.sp_wz .sp_jg {
  702 + color: #c4182e;
  703 + font-size: 30rpx;
  704 + overflow: hidden;
  705 + display: inline-block;
  706 + text-overflow: ellipsis;
  707 + white-space: nowrap;
  708 + margin-right: 10rpx;
  709 +}
  710 +
  711 +.sp_wz .sp_jgx {
  712 + color: #adadad;
  713 + text-decoration: line-through;
  714 + font-size: 24rpx;
  715 + overflow: hidden;
  716 + display: inline-block;
  717 + text-overflow: ellipsis;
  718 + white-space: nowrap;
  719 +}
  720 +
  721 +.one {
  722 + margin-left: 14rpx;
  723 +}
  724 +
  725 +.sp .sp_top .s_top1_kill {
  726 + position: absolute;
  727 + background-color: #c4182e;
  728 + font-size: 24rpx;
  729 + height: 38rpx;
  730 + line-height: 38rpx;
  731 + left: 265rpx;
  732 + top: 100rpx;
  733 + padding: 0 10rpx;
  734 + color: white;
  735 + border-radius: 10rpx;
  736 +}
  737 +
  738 +.sp .sp_top .s_top2_kill {
  739 + position: absolute;
  740 + background-color: #c4182e;
  741 + font-size: 24rpx;
  742 + height: 38rpx;
  743 + line-height: 38rpx;
  744 + right: 146rpx;
  745 + top: 100rpx;
  746 + padding: 0 10rpx;
  747 + color: white;
  748 + border-radius: 10rpx;
  749 +}
  750 +
  751 +.sp .sp_top .s_foot1_kill {
  752 + font-size: 20rpx;
  753 + position: absolute;
  754 + top: 270rpx;
  755 + width: 210rpx;
  756 + height: 38rpx;
  757 + line-height: 38rpx;
  758 + color: #fff;
  759 + text-align: center;
  760 + background-color: rgba(0, 0, 0, 0.5);
  761 +}
  762 +
  763 +.po1 {
  764 + position: absolute;
  765 +}
  766 +
  767 +.sp .sp_top .s_foot2_kill {
  768 + font-size: 20rpx;
  769 + position: absolute;
  770 + top: 270rpx;
  771 + width: 210rpx;
  772 + height: 38rpx;
  773 + line-height: 38rpx;
  774 + color: #fff;
  775 + text-align: center;
  776 + background-color: rgba(0, 0, 0, 0.5);
  777 +}
  778 +
  779 +.t_red{ color:red;}
  780 +
  781 +.sp .sp_top .s_img image.zs_t3_3l{
  782 + width: 56rpx;
  783 + height: 56rpx;
  784 + position: absolute;
  785 + left: 0rpx;
  786 + bottom: 10rpx;
  787 +}
  788 +.sp .sp_top .s_img image.zs_t1_3l{
  789 +width: 56rpx;
  790 +height: 56rpx;
  791 +position: absolute;
  792 +left: 0rpx;
  793 +top: 10rpx;
  794 +}
  795 +
  796 +.sp .sp_top .s_img image.zs_t2_3l{
  797 + width: 56rpx;
  798 + height: 56rpx;
  799 + position: absolute;
  800 + right: 0rpx;
  801 + top: 10rpx;
  802 +
  803 +}
  804 +.sp .sp_top .s_img image.zs_t4_3l{
  805 + width: 56rpx;
  806 + height: 56rpx;
  807 + position: absolute;
  808 + right: 0rpx;
  809 + bottom: 10rpx;
573 810  
  811 +}
574 812 \ No newline at end of file
... ...
components/diy_goodsGroup/g_filter.wxs
  Edit  View file @dff3310
... ... @@ -8,11 +8,23 @@ var get_class = function(column,position) {
8 8 if(column==3){ return "zs_t"+position+"_3l"; }
9 9 //----列表的情况-----
10 10 if(column==4 ){ return "zs_t1_x"+position; }
11   -
  11 + //--滑动的情况
  12 + if(column==5){ return "zs_t"+position+"_3l"; }
12 13 }
13 14  
14 15  
15 16 var g_filters = {
  17 + //判断边框类型
  18 + get_border_type:function(type){
  19 + if(!type) type=0;
  20 + var type=parseInt(type);
  21 + switch(type){
  22 + case 0: return "border_zhijiao";
  23 + case 1: return "border_yuanjiao";
  24 + }
  25 + return "";
  26 + }
  27 +
16 28 //-- 判断是不是有等级价 --
17 29 is_has_rank:function(rank_switch,item){
18 30 if(!rank_switch) return false;
... ... @@ -74,6 +86,8 @@ var g_filters = {
74 86 if(min_name.length>4 ) min_name=min_name.substring(0, 4);
75 87 return min_name;
76 88 },
  89 +
  90 +
77 91 }
78 92  
79 93  
... ... @@ -81,4 +95,5 @@ module.exports = {
81 95 get_class: get_class,
82 96 is_has_rank:g_filters.is_has_rank,
83 97 get_card_price:g_filters.get_card_price,
  98 + get_border_type:g_filters.get_border_type,
84 99 }
... ...
components/goods_list/goods_list.js
  Edit  View file @dff3310
... ... @@ -34,6 +34,7 @@ Component({
34 34 init: function () {
35 35 var th = this;
36 36 getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
  37 + isShowLoading:false,
37 38 success: function (e) {
38 39 getApp().globalData.userInfo = e.data.data;
39 40 getApp().getConfig2(function (e) {
... ... @@ -93,6 +94,7 @@ Component({
93 94 if (that.data.is_no_more == 0) return false;
94 95 var curPage = that.data.curPage;
95 96 getApp().request.get('/api/weshop/goods/page?page', {
  97 + isShowLoading:false,
96 98 data: {
97 99 is_mainshow: 1,
98 100 isonsale: 1,
... ...
custom-tab-bar/index.js 0 → 100644
  Edit  View file @dff3310
  1 +var app = getApp(), os = app.globalData.setting;
  2 +
  3 +Component({
  4 + data:{
  5 + fontcolor:'#6e6d6b',
  6 + fontcolor_sele:'#f23030',
  7 + backgroundColor:'#ffffff',
  8 + active:-1,
  9 + list:app.def_list,
  10 + cartGoodsNum:0,
  11 + },
  12 +
  13 +
  14 + lifetimes: {
  15 + attached: function() {
  16 +
  17 + //购物车显示商品金额
  18 + this.setData({cartGoodsNum:getApp().globalData.cartGoodsNum});
  19 + var th=this;
  20 +
  21 + var is_read=getApp().globalData.is_read;
  22 + var custum_data=getApp().globalData.custum_data;
  23 + if(is_read){
  24 + if(custum_data){
  25 + this.set_list(custum_data);
  26 + }
  27 + }else{
  28 + var stoid=os.stoid
  29 + getApp().request.promiseGet("/api/weshop/storeFooter/get/"+stoid, {
  30 + }).then(res => {
  31 + getApp().globalData.is_read=true;
  32 + var e = res;
  33 + if(e.data.code != -1){
  34 + var itemList = e.data.data.data;
  35 + itemList = JSON.parse(itemList)
  36 + //如果是有定义自定义导航的小程序链接
  37 + if(itemList[0].weappurl && itemList[0].weappurl!=""){
  38 + getApp().globalData.custum_data=e.data.data;
  39 + var custum_data=e.data.data;
  40 + th.set_list(custum_data);
  41 + }
  42 +
  43 + }
  44 +
  45 + })
  46 + }
  47 + },
  48 + },
  49 +
  50 +
  51 + methods: {
  52 + //设置自定义页面的列表
  53 + set_list:function(data){
  54 + var itemList = data.data;
  55 + itemList = JSON.parse(itemList);
  56 + this.setData({
  57 + list:itemList,
  58 + backgroundColor: data.bkcolor,
  59 + fontcolor_sele: data.fontcolor_sele,
  60 + fontcolor:data.fontcolor,
  61 + })
  62 +
  63 + },
  64 +
  65 + nav_goto:function(e){
  66 + var url=e.currentTarget.dataset.url;
  67 + if(!url) return false;
  68 + if(url[0]!='/') url='/'+url;
  69 + wx.switchTab({url:url,})
  70 + }
  71 +
  72 + }
  73 +
  74 +
  75 +})
0 76 \ No newline at end of file
... ...
custom-tab-bar/index.json 0 → 100644
  Edit  View file @dff3310
  1 +{
  2 + "component": true
  3 +}
0 4 \ No newline at end of file
... ...
custom-tab-bar/index.wxml 0 → 100644
  Edit  View file @dff3310
  1 +<!-- 如果是自定义的话 -->
  2 +<view class="main_bar" style=" background: {{backgroundColor}}; font-size: 30rpx;">
  3 + <block wx:for="{{list}}" wx:for-index="idx">
  4 + <view data-url="{{item.weappurl}}" bindtap="nav_goto" class="tabbar_item" data-act="{{active==idx?1:0}}"
  5 + style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};">
  6 + <view wx:if="{{item.nav_name=='购物车'}}" class="cart_num" >{{cartGoodsNum}} </view>
  7 + <view class="tab_img" style="margin-top: 10rpx;">
  8 + <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
  9 + </view>
  10 + <view style="height:20px;line-height:15px; margin-top: 10rpx;">
  11 + {{item.nav_name}}
  12 + </view>
  13 + </view>
  14 + </block>
  15 +</view >
  16 +
  17 +
  18 +
  19 +
  20 +
  21 +
  22 +
0 23 \ No newline at end of file
... ...
custom-tab-bar/index.wxss 0 → 100644
  Edit  View file @dff3310
  1 +.main_bar{
  2 + width:100%; border-top: 1rpx solid #ebebeb; position: fixed; bottom: 0; left: 0; z-index: 10000;
  3 +}
  4 +.tabbar_item{
  5 + position:relative;height:100%;float:left;text-align:center;padding:5px 0;
  6 +}
  7 +.tab_img{display: flex; justify-content: center;align-items: center}
  8 +.nav_imgage{
  9 + height: 56rpx; width: 56rpx;background-position: center;background-repeat: no-repeat;background-size: auto 85%;
  10 +}
  11 +.cart_num{
  12 + top:0;background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;line-height:40rpx;height: 40rpx;position: absolute;z-index: 100;right:30rpx;
  13 +}
0 14 \ No newline at end of file
... ...
pages/cart/cart/cart.js
  Edit  View file @dff3310
... ... @@ -54,14 +54,21 @@ Page({
54 54  
55 55 },
56 56 onShow: function() {
  57 +
  58 + if (typeof this.getTabBar === 'function' && this.getTabBar()) {
  59 + var index=getApp().getPageIndex(this);
  60 + this.getTabBar().setData({
  61 + active: index //数字是当前页面在tabbar的索引
  62 + })
  63 +
  64 + getApp().requestCardNum(this);
  65 + }
  66 +
57 67 var th = this;
58 68 //调用底部导航
59   - t.editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
  69 + //t.editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
60 70 this.getCardList();
61   - //--强行等待，让购物车的数量能够正确的线上
62   - setTimeout(function () {
63   - if(getApp().globalData.user_id) getApp().requestCardNum(th);
64   - },500)
  71 +
65 72  
66 73 //--获取是否又秒杀活动--
67 74 getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
... ... @@ -1300,7 +1307,13 @@ Page({
1300 1307 var prom_id=e.currentTarget.dataset.prom_id;
1301 1308 var url="/pages/goods/goodsList/goodsList?prom_type=3&prom_id="+prom_id;
1302 1309 getApp().goto(url);
1303   - }
1304   -
1305   -
  1310 + },
  1311 +
  1312 + //导航跳转
  1313 + nav_goto:function(e){
  1314 + var url=e.currentTarget.dataset.url;
  1315 + if(!url || url=='') return;
  1316 + if(url[0]!='/') url='/'+url;
  1317 + getApp().goto(url);
  1318 + }
1306 1319 });
1307 1320 \ No newline at end of file
... ...
pages/cart/cart/cart.wxml
  Edit  View file @dff3310
1   -<import src="../../tabbar/tabbar.wxml" />
  1 +<!-- <import src="../../tabbar/tabbar.wxml" />
2 2 <template is="tabBar" data="{{tabBar}}" />
3   -
  3 + -->
4 4 <!-- 广告图片 -->
5 5 <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
6 6 <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  Edit  View file @dff3310
... ... @@ -31,8 +31,6 @@ Page({
31 31 default_color:null,
32 32 },
33 33 onLoad: function(options) {
34   -
35   -
36 34 var th = this;
37 35 th.setData({
38 36 isBuy: options.isBuy,
... ... @@ -43,6 +41,7 @@ Page({
43 41 th.close();
44 42 },
45 43 onShow: function() {
  44 +
46 45 //--先判断会员状态--
47 46 var user_info = getApp().globalData.userInfo;
48 47 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
... ... @@ -383,9 +382,9 @@ Page({
383 382  
384 383 pagePath+="?isBuy="+this.data.isBuy;
385 384 if(this.data.isBuy==0){
386   - pagePath+="&lbId="+this.data.getGiftID;
387   - }else{
388 385 pagePath+="&orderSn="+this.data.orderSn;
  386 + }else{
  387 + pagePath+="&lbId="+this.data.getGiftID;
389 388 }
390 389  
391 390 return {
... ...
pages/goods/categoryList/categoryList.js
  Edit  View file @dff3310
... ... @@ -66,6 +66,8 @@ Page({
66 66 is_show_class:false,//是否添加新样式
67 67 status_show:0,
68 68 currentTab: 0, //预设当前项的值
  69 +
  70 + load:0,
69 71 },
70 72  
71 73  
... ... @@ -171,15 +173,26 @@ Page({
171 173 }
172 174 });
173 175 },
174   -
175 176 onShow:function(){
  177 +
  178 + if (typeof this.getTabBar === 'function' && this.getTabBar()) {
  179 + var index=getApp().getPageIndex(this);
  180 + this.getTabBar().setData({
  181 + active: index //数字是当前页面在tabbar的索引
  182 + });
  183 + getApp().requestCardNum(this);
  184 + }
  185 +
  186 +
176 187 var that=this;
177 188 //调用底部导航
178   - t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
  189 + //t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
179 190 //this.requestFirstCategoris();
180 191 setTimeout(function () {
181   - if (getApp().globalData.user_id) getApp().requestCardNum(that);
  192 + //if (getApp().globalData.user_id) getApp().requestCardNum(that);
182 193 },500)
  194 +
  195 + if(this.data.load) return false;
183 196  
184 197 getApp().getConfig2(function (e) {
185 198  
... ... @@ -256,6 +269,8 @@ Page({
256 269 }else if(that.data.is_show_pp && that.data.select_classify_on == 220){
257 270 that.setData({ status_show: 2 });
258 271 }
  272 +
  273 + that.data.load=1;
259 274 })
260 275  
261 276 },
... ... @@ -507,39 +522,47 @@ Page({
507 522 var arr=new Array();
508 523 var dda = e.data.data.pageData;
509 524 s.setData({brand_list:dda});
510   - for (var i = 0; i < dda.length; i++) {
511   - //console.log(dda[i].logo)
512   - if(dda[i].logo && dda[i].logo.indexOf("http")<0){
513   - dda[i].logo = oo.imghost+dda[i].logo;
514   - }
515   - if (arr.length>0){
516   - var find = 0;
517   - //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素
518   - for (var k = 0; k < arr.length;k++){
519   - if(dda[i].zm == arr[k].zm){ find=k+1; break;}
520   - }
521   - if (find == 0) {
522   - var item = { zm: dda[i].zm, array: new Array() }
523   - item.array.push(dda[i]);
524   - arr.push(item);
525   - } else{
526   - arr[find - 1].array.push(dda[i]);
527   - }
528   - }else{
529   - var item = { zm: dda[i].zm, array: new Array() }
530   - item.array.push(dda[i]);
531   - arr.push(item);
532   - }
533   - }
534   - //进行排序
535   - arr.sort(compare("zm"));
536   - for(var i=0;i< arr.length;i++){
537   - for(var j=0;j<arr[i].array.length;j++){
538   - if(arr[i].array[j].logo == ""){
539   - arr[i].array[j].logo= s.data.iurl+"/miniapp/images/no_brand_def.jpg";
540   - }
541   - }
542   - }
  525 +
  526 +
  527 + for (var i = 0; i < dda.length; i++) {
  528 + //console.log(dda[i].logo)
  529 + if(dda[i].logo==""){
  530 + dda[i].logo= s.data.iurl+"/miniapp/images/no_brand_def.jpg";
  531 + }else if(dda[i].logo && dda[i].logo.indexOf("http")<0){
  532 + dda[i].logo = oo.imghost+dda[i].logo;
  533 + }
  534 +
  535 + //进行排序，只有是默认排序的时候，才按首字母排序
  536 + if(parseInt(s.data.is_used_share)!=0) continue;
  537 +
  538 + if (arr.length>0){
  539 + var find = 0;
  540 + //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素
  541 + for (var k = 0; k < arr.length;k++){
  542 + if(dda[i].zm == arr[k].zm){ find=k+1; break;}
  543 + }
  544 + if (find == 0) {
  545 + var item = { zm: dda[i].zm, array: new Array() }
  546 + item.array.push(dda[i]);
  547 + arr.push(item);
  548 + } else{
  549 + arr[find - 1].array.push(dda[i]);
  550 + }
  551 + }else{
  552 + var item = { zm: dda[i].zm, array: new Array() }
  553 + item.array.push(dda[i]);
  554 + arr.push(item);
  555 + }
  556 + }
  557 + if(parseInt(s.data.is_used_share)==0){
  558 + arr.sort(compare("zm"));
  559 + }else{
  560 + var ob={array:dda};
  561 + arr.push(ob);
  562 + }
  563 +
  564 +
  565 +
543 566 s.setData({ groups: arr });
544 567 //console.log(s.data.groups)
545 568 }
... ... @@ -981,6 +1004,14 @@ Page({
981 1004 var ob = { "card_list": new_arr, "name_map": card_name_map };
982 1005 func(ob);
983 1006 })
984   - }
  1007 + },
  1008 +
  1009 + //导航跳转
  1010 + nav_goto:function(e){
  1011 + var url=e.currentTarget.dataset.url;
  1012 + if(!url || url=='') return;
  1013 + if(url[0]!='/') url='/'+url;
  1014 + getApp().goto(url);
  1015 + }
985 1016  
986 1017 });
987 1018 \ No newline at end of file
... ...
pages/goods/categoryList/categoryList.wxml
  Edit  View file @dff3310
1   -<import src="../../tabbar/tabbar.wxml" />
2   -<template is="tabBar" data="{{tabBar}}" />
  1 +<!-- <import src="../../tabbar/tabbar.wxml" />
  2 +<template is="tabBar" data="{{tabBar}}" /> -->
3 3  
4 4 <!-- 风格1 -->
5 5 <block wx:if="{{is_used_share==0}}">
... ... @@ -101,7 +101,7 @@
101 101 <block wx:elif="{{is_used_share == 1}}">
102 102 <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
103 103 <!-- 新版分类头部 -->
104   - <view class="xc-search-box flex-center white_b" style="position:fixed;top:0;z-index:99999">
  104 + <view class="xc-search-box flex-center white_b" style="position:fixed;top:0;z-index:99">
105 105 <view class="share-height t-c" bindtap="getScancode" >
106 106 <image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
107 107 <view class="fs24">
... ... @@ -120,7 +120,7 @@
120 120 <!-- 分类项目内容 22 -->
121 121 <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx" id="two_type">
122 122 <!-- 分类项目的类型 -->
123   - <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:126rpx;">
  123 + <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;">
124 124 <view class="project_type-frame" style="margin-bottom:120rpx;">
125 125 <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
126 126 <!-- <view style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
... ... @@ -273,7 +273,7 @@
273 273 <block wx:elif="{{is_used_share == 2}}">
274 274 <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
275 275 <!-- 头部 -->
276   - <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99999">
  276 + <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99">
277 277 <view class="share-height t-c" bindtap="getScancode" >
278 278 <image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
279 279 <view class="fs24">
... ... @@ -291,7 +291,7 @@
291 291 <!-- 分类项目内容 -->
292 292 <view class="flex project_height" style="margin-left:-10rpx;">
293 293 <!-- 分类项目的类型 -->
294   - <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:126rpx;" id="thress_type3">
  294 + <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;" id="thress_type3">
295 295 <view class="project_type-frame" style="margin-bottom:120rpx;">
296 296 <view wx:if="{{is_show_gb}}">
297 297 <view bindtap="click_classify" class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}" data-current="223" data-index="223" data-name="国家" wx:if="{{is_country}}">
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  Edit  View file @dff3310
... ... @@ -825,7 +825,7 @@
825 825 <view>收藏</view>
826 826 </view>
827 827 <view class="shopping-cart cart-ico new_split">
828   - <navigator url="/pages/cart/cart/cart">
  828 + <navigator open-type="switchTab" url="/pages/cart/cart/cart">
829 829 <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
830 830 <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view>
831 831 <view>购物车</view>
... ...
pages/index/index/index.js
  Edit  View file @dff3310
... ... @@ -90,12 +90,18 @@ Page({
90 90 th.setData({
91 91 is_boot: is_init
92 92 });
  93 +
  94 + if(!is_init){
  95 + th.setData({
  96 + swiperimage: []
  97 + });
  98 + }
93 99 }
94 100 })
95 101  
96 102 //调用底部导航
97   - getApp().globalData.url=th.data.url
98   - t.editTabBar(th,o.stoid,th.data.url);
  103 + //getApp().globalData.url=th.data.url
  104 + //t.editTabBar(th,o.stoid,th.data.url);
99 105  
100 106 await this.init_load();
101 107 //显示的时候要开启计时器
... ... @@ -171,6 +177,15 @@ Page({
171 177 },
172 178  
173 179 async onShow() {
  180 + if (typeof this.getTabBar === 'function' && this.getTabBar()) {
  181 + var index=getApp().getPageIndex(this);
  182 + this.getTabBar().setData({
  183 + active: index //数字是当前页面在tabbar的索引
  184 + })
  185 +
  186 + getApp().requestCardNum(this);
  187 + }
  188 +
174 189 var th = this
175 190 },
176 191 //当隐藏的时候就关闭计时器
... ... @@ -234,12 +249,12 @@ Page({
234 249 var th = this;
235 250 //----广告----
236 251 var e = this;
237   - await getApp().request.promiseGet("/api/weshop/ad/list?pid=2&store_id=" + o.stoid, {
  252 + await getApp().request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + o.stoid, {
238 253 data: {
239 254 enabled: 1
240 255 }
241 256 }).then(res => {
242   - var a = res.data.data;
  257 + var a = res.data.data.pageData;
243 258 var arr = new Array();
244 259 for (var i = 0; i < a.length; i++) {
245 260 var tt = {
... ... @@ -399,6 +414,7 @@ Page({
399 414 this.setData({
400 415 ishow: 1
401 416 });
  417 +
402 418 //---先获取会员---
403 419 t.getUserFir(function() {
404 420 th.is_festival();
... ... @@ -714,6 +730,7 @@ Page({
714 730 var user_info = getApp().globalData.userInfo;
715 731 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
716 732 wx.navigateTo({
  733 + //url: '/pages/togoin/togoin',
717 734 url: '/pages/getphone/getphone',
718 735 })
719 736 return false;
... ... @@ -832,6 +849,16 @@ Page({
832 849 if(!url || url=='') return;
833 850 if(url[0]!='/') url='/'+url;
834 851 getApp().goto(url);
835   - }
  852 + },
  853 +
  854 + //导航跳转
  855 + nav_goto:function(e){
  856 + var url=e.currentTarget.dataset.url;
  857 + if(!url || url=='') return;
  858 + if(url[0]!='/') url='/'+url;
  859 + getApp().goto(url);
  860 + }
  861 +
  862 +
836 863  
837 864 });
838 865 \ No newline at end of file
... ...
pages/index/index/index.wxml
  Edit  View file @dff3310
1   -<import src="../../tabbar/tabbar.wxml" />
2   -<template is="tabBar" data="{{tabBar}}"/>
3   -
  1 +<!-- <import src="../../tabbar/tabbar.wxml" /> -->
  2 +<!-- <template is="tabBar" data="{{tabBar}}"/> -->
4 3 <!--普通界面-->
5 4 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
6 5 <view class="container rel" wx:if="{{ishow}}">
... ... @@ -112,6 +111,7 @@
112 111 </view>
113 112 </view>
114 113 <!-- 轮播 -->
  114 + <block wx:if="{{swiperimage.length>0}}">
115 115 <swiper class="swiper" autoplay="true" interval="5000" circular="{{true}}" indicator-dots="{{true}}" indicator-active-color="rgb(255,255,255)">
116 116 <!-- 活动轮播 -->
117 117 <block wx:for="{{swiperimage}}" wx:for-item="adver" wx:for-index="key">
... ... @@ -122,6 +122,7 @@
122 122 </swiper-item>
123 123 </block>
124 124 </swiper>
  125 + </block>
125 126  
126 127 <view class="split-line"></view>
127 128  
... ...
pages/team/team_show/team_show.js
  Edit  View file @dff3310
... ... @@ -60,6 +60,35 @@ Page({
60 60 redis_arr:null,
61 61  
62 62 iurl:os.imghost,
  63 +
  64 +
  65 + openSpecModal: !1,
  66 + openSpecModal_pt: !1, //拼单的弹起，
  67 +
  68 +
  69 + //门店相关
  70 + ismend: 0,
  71 + is_sec_mend: 0,
  72 + sto_sele_name: "", //选中的门店名称
  73 + sto_sele_id: "", //选中的门店id
  74 + sto_sele_distr: "", //选择的门店的配送方式
  75 + is_show_sto_cat: 1, //是否显示门店分类
  76 + only_pk: null,
  77 + all_sto: null,
  78 + sec_sto: null, //选择了的门店分类
  79 + pickpu_list: null, //读出的所有门店list
  80 + def_pickpu_list: null, //一开始5个门店list
  81 + sec_pick_index: 0, //第二级门店选择ID
  82 + fir_pick_index: 0, //第一级门店选择ID
  83 + all_pick_list:null,//所有的门店先记录起来
  84 + bconfig:null,
  85 + def_pick_store: null, // 默认的门店
  86 + fir_def_store:null, //客户默认的门店的
  87 + lat: null, //维度
  88 + lon: null, //经度
  89 +
  90 + is_get_local_ok: 0, //获取坐标是否完成
  91 +
63 92 },
64 93 onLoad: function(options) {
65 94  
... ... @@ -87,20 +116,21 @@ Page({
87 116 })
88 117 }
89 118  
90   -
91 119 this.setData({tg_id: tg_id });
92   - getApp().globalData.to_group=null;
  120 + getApp().globalData.to_group=null;
  121 +
  122 + var th=this;
  123 + getApp().getConfig2(function(e) {
  124 + th.setData({ bconfig: e,});
  125 + th.wait_for_store_config(); //获取默认的门店
  126 + })
  127 +
93 128 },
94 129  
95 130 //显示加载
96 131 onShow:function(){
97 132 var tg_id = this.data.tg_id,th=this;
98   - this.init(tg_id);
99   -
100   - getApp().get_user_store(function (e) {
101   - if(e)
102   - th.setData({ pick_id: e.pickup_id, end_name: e.pickup_name,ii:1 })
103   - })
  133 + this.init(tg_id);
104 134 },
105 135  
106 136 //c点击打开拼团弹窗
... ... @@ -327,7 +357,8 @@ Page({
327 357 teamgroup = null, //活動从表
328 358 max_num = 0,
329 359 min_price = 0,
330   - th=this;
  360 + th=this,
  361 + that=th;
331 362  
332 363 //获取活动从表信息team_id,listno团编号（券号）
333 364 await getApp().request.promiseGet("/api/weshop/teamgroup/get/"+os.stoid+"/"+tg_id, {
... ... @@ -451,7 +482,21 @@ Page({
451 482 original_img = ee.data.imageurl + res.data.data.original_img,
452 483 goods = res.data.data
453 484 })
454   -
  485 +
  486 + //显示商品规格
  487 + var gg = "";
  488 + if(goods.goods_spec=="null" || goods.goods_spec==null ) goods.goods_spec="";
  489 + if(goods.goods_color=="null" || goods.goods_color==null) goods.goods_color="";
  490 +
  491 + if (goods.goods_spec != "" && goods.goods_color != "") {
  492 + gg = goods.goods_spec + "/" + goods.goods_color;
  493 + } else if (goods.goods_spec != "" || goods.goods_color != "") {
  494 + gg = goods.goods_spec + goods.goods_color;
  495 + } else {
  496 + gg = "规格1";
  497 + }
  498 + goods.gg = gg;
  499 +
455 500 //只装5个
456 501 var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num;
457 502 if (max_num) {
... ... @@ -512,7 +557,83 @@ Page({
512 557 pageteam = res.data.data.pageData;
513 558 });
514 559  
515   - //获取下redis长度，如果团已经弄完，或者拼单已经卖完
  560 + //-- 获取用户的默认门店 --
  561 + getApp().get_user_store(function(ee) {
  562 + if(!ee) {
  563 + th.data.fir_def_store={}; //赋值空对象
  564 + return false;
  565 + }
  566 + //--定时器推迟一下--
  567 + setTimeout(function () {
  568 + var g_distr_type=th.data.goods.distr_type;
  569 + //--如果默认门店的配送方式不对，就不能被选择--
  570 + if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
  571 + th.data.fir_def_store={}; //赋值空对象
  572 + return false;
  573 + }
  574 +
  575 + var appd=getApp().globalData;
  576 + var w_time = setInterval(function() {
  577 + if (that.data.is_get_local_ok == 0) return false;
  578 + clearInterval(w_time);
  579 + var distance = null;
  580 + var e=JSON.parse(JSON.stringify(ee));
  581 +
  582 + //如果有开启近距离的话,同时距离优不一样了
  583 + if (that.data.lat != null) {
  584 + //如果经纬度有变化的话
  585 + if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){
  586 + that.data.fir_def_store=e;
  587 + that.setData({
  588 + def_pick_store: e,
  589 + sto_sele_name: e.pickup_name,
  590 + sto_sele_id: e.pickup_id,
  591 + sto_sele_distr: e.distr_type
  592 + })
  593 + }else{
  594 + //要用接口是获取距离，js的计算不准
  595 + getApp().request.promiseGet("/api/weshop/pickup/list",{
  596 + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
  597 + }).then(res=>{
  598 + if(res.data.code==0){
  599 + e=res.data.data.pageData[0];
  600 + if (e){
  601 + appd.pk_store=e;
  602 + that.data.fir_def_store=e;
  603 + that.setData({
  604 + def_pick_store: e,
  605 + sto_sele_name: e.pickup_name,
  606 + sto_sele_id: e.pickup_id,
  607 + sto_sele_distr: e.distr_type
  608 + })
  609 + }
  610 +
  611 + }
  612 + })
  613 + }
  614 +
  615 + //e.distance = distance;
  616 + appd.lat=that.data.lat;
  617 + appd.lon=that.data.lon;
  618 +
  619 + }else{
  620 + if (e) {
  621 + e.distance = null;
  622 + that.data.fir_def_store=e;
  623 + that.setData({
  624 + def_pick_store: e,
  625 + sto_sele_name: e.pickup_name,
  626 + sto_sele_id: e.pickup_id,
  627 + sto_sele_distr: e.distr_type
  628 + })
  629 + }
  630 + }
  631 +
  632 + }, 500)
  633 + },1000)
  634 + });
  635 +
  636 + //获取下redis长度，如果团已经弄完，或者拼单已经卖完
516 637 //设置值
517 638 ee.setData({
518 639 ordertx2: ordertx2,
... ... @@ -526,11 +647,10 @@ Page({
526 647 sf_arr: sf_arr
527 648 });
528 649 ee.countDown2();
529   - //---设置门店---
530   - ee.get_sto();
531   -
  650 + //---设置门店---
  651 + ee.get_sto();
532 652 //---定时设置一下待支付的订单---
533   - ee.time_out();
  653 + ee.time_out();
534 654 },
535 655  
536 656 onHide:function(){
... ... @@ -723,6 +843,11 @@ Page({
723 843 //------去支付，购买-------
724 844 go_pay:function () {
725 845 var th=this;
  846 + var def_pick_store=this.data.def_pick_store;
  847 + if(def_pick_store) {
  848 + th.data.pick_id=def_pick_store.pickup_id; //选择门店
  849 + th.data.end_name=def_pick_store.pickup_name;
  850 + }
726 851 if (th.data.pick_id == 0) return s.my_warnning("请选择门店", 0, th);
727 852  
728 853 //----判断起购数----
... ... @@ -941,5 +1066,507 @@ Page({
941 1066 imageUrl: img,
942 1067 }
943 1068 },
  1069 +
  1070 +
  1071 +
  1072 +
  1073 +
  1074 + closeSpecModal: function() {
  1075 + this.setData({
  1076 + yijian: false
  1077 + });
  1078 + },
  1079 +
  1080 + close_popup: function() {
  1081 + this.setData({
  1082 + showStore: true
  1083 + });
  1084 + },
  1085 +
  1086 +
  1087 +
  1088 + //-- 选择门店。此时的门店选择与门店有关系 --
  1089 + choice_store: function(ee) {
  1090 +
  1091 + var th = this;
  1092 + var bconfig = th.data.bconfig;
  1093 + if(!th.data.only_pk && !th.data.def_pickpu_list){
  1094 + getApp().confirmBox("门店库存不足", null, 25000, !1);
  1095 + return false;
  1096 + }
  1097 + if(th.data.only_pk && !th.data.only_pk.length){
  1098 + getApp().confirmBox("门店库存不足", null, 25000, !1);
  1099 + return false;
  1100 + }
  1101 + if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){
  1102 + getApp().confirmBox("门店库存不足", null, 25000, !1);
  1103 + return false;
  1104 + }
  1105 +
  1106 + if (bconfig.is_sort_storage) {
  1107 + wx.getLocation({
  1108 + type: 'wgs84',
  1109 + success: function(res) {
  1110 +
  1111 + th.data.lat = res.latitude;
  1112 + th.data.lon = res.longitude;
  1113 + th.data.is_get_local_ok = 1;
  1114 + th.setData({
  1115 + is_gps: 1
  1116 + });
  1117 + //th.onShow();
  1118 + th.get_sto();
  1119 + },
  1120 + fail: function(res) {
  1121 + //th.onShow();
  1122 + th.data.is_get_local_ok = 1;
  1123 + th.get_sto();
  1124 + if (res.errCode == 2) {
  1125 + th.setData({
  1126 + is_gps: 0
  1127 + });
  1128 + if (th.data.is_gps == 0) {
  1129 + getApp().confirmBox("请开启GPS定位", null, 25000, !1);
  1130 + }
  1131 + } else {
  1132 + th.setData({
  1133 + is_gps: "3"
  1134 + });
  1135 + }
  1136 +
  1137 + }
  1138 + })
  1139 + }else{
  1140 + th.data.is_get_local_ok = 1;
  1141 + th.get_sto();
  1142 + }
  1143 +
  1144 + this.setData({
  1145 + store: 1,
  1146 + yijian: false,
  1147 + })
  1148 +
  1149 + },
  1150 +
  1151 +
  1152 + //选择更多门店
  1153 + more_store: function() {
  1154 + this.setData({ sort_store: 1});
  1155 + },
  1156 +
  1157 + // 返回按钮
  1158 + returns: function() {
  1159 + this.setData({
  1160 + sort_store: 0,choice_sort_store: 0
  1161 + });
  1162 + },
  1163 +
  1164 +
  1165 + //-- 等待获取定位系统 --
  1166 + wait_for_store_config: function() {
  1167 + var th = this;
  1168 + var t_time = setInterval(function() {
  1169 + if (th.data.bconfig == null) false;
  1170 + var e = th.data.bconfig;
  1171 + if (e.is_sort_storage) {
  1172 + wx.getLocation({
  1173 + type: 'wgs84',
  1174 + success: function(res) {
  1175 + th.data.lat = res.latitude;
  1176 + th.data.lon = res.longitude;
  1177 + th.data.is_get_local_ok = 1;
  1178 + },
  1179 + fail: function(res) {
  1180 + if (res.errCode == 2) {
  1181 + th.setData({
  1182 + is_gps: 0
  1183 + });
  1184 + if (th.data.is_gps == 0) {
  1185 + getApp().confirmBox("请开启GPS定位", null, 10000, !1);
  1186 + }
  1187 +
  1188 + } else {
  1189 + th.setData({
  1190 + is_gps: "3"
  1191 + });
  1192 + }
  1193 +
  1194 + th.data.is_get_local_ok = 1;
  1195 + }
  1196 + })
  1197 + } else {
  1198 + th.data.is_get_local_ok = 1;
  1199 + }
  1200 + clearInterval(t_time);
  1201 + }, 500)
  1202 + },
  1203 +
  1204 +
  1205 + //---------拿出门店分类和门店------------
  1206 + get_sto(e) {
  1207 + var th = this,that=this;
  1208 + var timer_get = setInterval(function() {
  1209 + if (th.data.is_get_local_ok == 0) return false;
  1210 + var dd = null,
  1211 + i = getApp().request;
  1212 + var g_distr_type = th.data.goods.distr_type;
  1213 + if (g_distr_type != 0) {
  1214 + dd = {
  1215 + store_id: o.stoid,
  1216 + distr_type: g_distr_type,
  1217 + isstop: 0,
  1218 + pageSize: 2000
  1219 + }
  1220 + } else {
  1221 + dd = {
  1222 + store_id: o.stoid,
  1223 + isstop: 0,
  1224 + pageSize: 2000
  1225 + }
  1226 + }
  1227 + //如果有距离的话
  1228 + if (th.data.lat != null) {
  1229 + dd.lat = th.data.lat;
  1230 + dd.lon = th.data.lon;
  1231 + }
  1232 + clearInterval(timer_get);
  1233 +
  1234 + if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
  1235 + th.setData({def_pick_store:null});
  1236 + }
  1237 +
  1238 + //----------获取门店----------------
  1239 + getApp().request.promiseGet("/api/weshop/pickup/list", {
  1240 + data: dd,
  1241 + }).then(res => {
  1242 + var e = res;
  1243 + if (e.data.code == 0) {
  1244 +
  1245 + //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
  1246 + if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){
  1247 + th.setData({
  1248 + def_pick_store:e.data.data.pageData[0],
  1249 + sto_sele_name: e.data.data.pageData[0].pickup_name,
  1250 + sto_sele_id: e.data.data.pageData[0].pickup_id,
  1251 + sto_sele_distr: e.data.data.pageData[0].distr_type
  1252 + });
  1253 + th.data.fir_def_store=e.data.data.pageData[0];
  1254 + }
  1255 +
  1256 + //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
  1257 + if (th.data.def_pick_store && (th.data.def_pick_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type )){
  1258 + for (var k = 0; k < e.data.data.pageData.length; k++) {
  1259 + if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
  1260 + e.data.data.pageData.splice(k, 1); //删除
  1261 + break;
  1262 + }
  1263 + }
  1264 + e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
  1265 + }
  1266 +
  1267 +
  1268 + th.setData({all_pick_list:e.data.data.pageData});
  1269 +
  1270 +
  1271 + setTimeout(function(){
  1272 + th.deal_pickup(e); //--普通门店排版--
  1273 + },800)
  1274 +
  1275 + }
  1276 + })
  1277 + }, 200)
  1278 +
  1279 + },
  1280 +
  1281 + //------------处理门店,拼团活动只有线上库存---------------
  1282 + deal_pickup(e){
  1283 + var th=this;
  1284 + var g_distr_type=th.data.goods.distr_type;
  1285 + //单总量超出5个的时候
  1286 + if (e.data.data.total > 5) {
  1287 + getApp().request.get("/api/weshop/storagecategory/page", {
  1288 + data: {
  1289 + store_id: o.stoid,
  1290 + is_show: 1,
  1291 + pageSize: 1000
  1292 + },
  1293 + success: function(ee) {
  1294 + if (ee.data.code == 0) {
  1295 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
  1296 + var def_arr = new Array();
  1297 + var ishas = 0;
  1298 + //-- 开始就看5个门店 --
  1299 + for (var k = 0; k < 5; k++) {
  1300 + if (k == e.data.data.pageData.length) break;
  1301 + def_arr.push(e.data.data.pageData[k]);
  1302 + }
  1303 +
  1304 + th.setData({
  1305 + def_pickpu_list: def_arr,
  1306 + pickpu_list: ee.data.data.pageData
  1307 + });
  1308 + var sto_cate = ee.data.data.pageData;
  1309 + var sto_arr = e.data.data.pageData;
  1310 + var newarr = new Array();
  1311 + var qita = new Array();
  1312 +
  1313 + //----要进行门店分组--------
  1314 + for (var i = 0; i < sto_arr.length; i++) {
  1315 + //找一下这个门店有没有在分类数组内
  1316 + var find2 = 0,
  1317 + find2name = "";
  1318 + for (var m = 0; m < sto_cate.length; m++) {
  1319 + if (sto_arr[i].category_id == sto_cate[m].cat_id) {
  1320 + find2 = sto_cate[m].cat_id;
  1321 + find2name = sto_cate[m].cat_name;
  1322 + break;
  1323 + }
  1324 + }
  1325 +
  1326 + if (newarr.length > 0) {
  1327 + var find = 0;
  1328 + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
  1329 + if (find2 != 0) {
  1330 + for (var ii = 0; ii < newarr.length; ii++) {
  1331 + if (sto_arr[i].category_id == newarr[ii].cat_id) {
  1332 + newarr[ii].s_arr.push(sto_arr[i]);
  1333 + find = 1;
  1334 + break;
  1335 + }
  1336 + }
  1337 + if (find == 0) {
  1338 + var arr0 = new Array();
  1339 + arr0.push(sto_arr[i]);
  1340 + var item = {
  1341 + cat_id: find2,
  1342 + name: find2name,
  1343 + s_arr: arr0
  1344 + };
  1345 + newarr.push(item);
  1346 + }
  1347 + } else {
  1348 + qita.push(sto_arr[i]);
  1349 + }
  1350 + } else {
  1351 + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
  1352 + if (find2 != 0) {
  1353 + var arr0 = new Array();
  1354 + arr0.push(sto_arr[i]);
  1355 + var item = {
  1356 + cat_id: find2,
  1357 + name: find2name,
  1358 + s_arr: arr0
  1359 + };
  1360 + newarr.push(item);
  1361 + } else {
  1362 + qita.push(sto_arr[i]);
  1363 + }
  1364 + }
  1365 + }
  1366 +
  1367 + //----安排其他的分类-----
  1368 + if (qita.length > 0) {
  1369 + var item = {
  1370 + cat_id: -1,
  1371 + name: "其他",
  1372 + s_arr: qita
  1373 + };
  1374 + newarr.push(item);
  1375 + }
  1376 + th.setData({
  1377 + is_show_sto_cat: 1,
  1378 + all_sto: newarr
  1379 + });
  1380 +
  1381 + } else {
  1382 + th.setData({
  1383 + is_show_sto_cat: -1,
  1384 + only_pk: e.data.data.pageData
  1385 + });
  1386 + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
  1387 + if (!th.data.def_pick_store) {
  1388 + th.setData({def_pick_store:e.data.data.pageData[0]})
  1389 + }
  1390 + }
  1391 + } else {
  1392 + th.setData({
  1393 + is_show_sto_cat: -1,
  1394 + only_pk: e.data.data.pageData
  1395 + });
  1396 + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
  1397 + if (!th.data.def_pick_store) {
  1398 + th.setData({def_pick_store:e.data.data.pageData[0]})
  1399 + }
  1400 +
  1401 + }
  1402 + }
  1403 + });
  1404 + } else {
  1405 + th.setData({
  1406 + is_show_sto_cat: 0,
  1407 + only_pk: e.data.data.pageData
  1408 + });
  1409 + //-----如果没有默认门店，要取第一个门店作为默认店------
  1410 + if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) {
  1411 + th.setData({
  1412 + def_pick_store:e.data.data.pageData[0],
  1413 + sto_sele_name: e.data.data.pageData[0].pickup_name,
  1414 + sto_sele_id: e.data.data.pageData[0].pickup_id,
  1415 + sto_sele_distr: e.data.data.pageData[0].distr_type
  1416 + })
  1417 + }
  1418 + }
  1419 + },
  1420 + //---选择分类门店---
  1421 + choice_sort_store: function(e) {
  1422 + var index = e.currentTarget.dataset.index;
  1423 + var region_name = e.currentTarget.dataset.region;
  1424 + var item = this.data.all_sto[index];
  1425 + this.setData({
  1426 + region_name: region_name,
  1427 + sort_store: 0,
  1428 + choice_sort_store: 1,
  1429 + sec_sto: item,
  1430 + sec_pick_index: 0
  1431 + });
  1432 + },
  1433 +
  1434 + choose_for_store_fir: function(e) {
  1435 + var index_c = e.currentTarget.dataset.ind;
  1436 + var th=this;
  1437 + th.setData({
  1438 + fir_pick_index: index_c
  1439 + })
  1440 + },
  1441 +
  1442 + //---点击二级之后的选择---
  1443 + choose_for_store: function(e) {
  1444 + var index_c = e.currentTarget.dataset.ind;
  1445 + var th=this;
  1446 + th.setData({
  1447 + sec_pick_index: index_c,
  1448 + fir_pick_index: index_c
  1449 + })
  1450 +
  1451 + },
  1452 +
  1453 + //确定def_pick为选择的门店
  1454 + sure_pick: function(e) {
  1455 + var th = this;
  1456 + var item = null;
  1457 +
  1458 + if (th.data.choice_sort_store == 0) {
  1459 + var index = th.data.fir_pick_index;
  1460 + if (th.data.is_show_sto_cat == 1) {
  1461 + item = th.data.def_pickpu_list[index];
  1462 + } else {
  1463 + item = th.data.only_pk[index]; //当没有门店分类的时候
  1464 + }
  1465 +
  1466 + } else {
  1467 + var index = th.data.sec_pick_index;
  1468 + item = th.data.sec_sto.s_arr[index];
  1469 + }
  1470 +
  1471 +
  1472 + th.setData({
  1473 + def_pick_store: item,
  1474 + sto_sele_name: item.pickup_name,
  1475 + sto_sele_id: item.pickup_id,
  1476 + sto_sele_distr: item.distr_type,
  1477 + store: 0,
  1478 + choice_sort_store: 0,
  1479 + fir_pick_index: 0
  1480 + });
  1481 +
  1482 +
  1483 + th.setData({
  1484 + yijian: 1, //打开拼团购买界面
  1485 + store: 0, //关闭门店
  1486 + choice_sort_store: 0, //关闭门店2级
  1487 + sort_store: 0, //关闭门店2级
  1488 + });
  1489 +
  1490 +
  1491 + },
  1492 +
  1493 +
  1494 +
  1495 + //把选择的门店设置成默认的门店def_pick
  1496 + set_def_pick: function(e) {
  1497 + var th = this;
  1498 + var item = null;
  1499 + if (th.data.choice_sort_store == 0) {
  1500 + var index = th.data.fir_pick_index;
  1501 + if (th.data.is_show_sto_cat == 1) {
  1502 + item = th.data.def_pickpu_list[index];
  1503 + } else {
  1504 + item = th.data.only_pk[index]; //当没有门店分类的时候
  1505 + }
  1506 + } else {
  1507 + var index = th.data.sec_pick_index;
  1508 + item = th.data.sec_sto.s_arr[index];
  1509 + }
  1510 +
  1511 +
  1512 + var store_id = o.stoid;
  1513 + var user_id = getApp().globalData.user_id;
  1514 + var def_pickup_id = item.pickup_id;
  1515 +
  1516 + getApp().request.put('/api/weshop/users/update', {
  1517 + data: {
  1518 + user_id,
  1519 + def_pickup_id
  1520 + },
  1521 + success: function(res) {
  1522 + if (res.data.code == 0) {
  1523 + if (th.data.choice_sort_store == 0) th.setData({
  1524 + fir_pick_index: 0
  1525 + });
  1526 + getApp().globalData.pk_store = item;
  1527 + } else {
  1528 + getApp().my_warnning("设置默认门店地址失败",0,th)
  1529 + }
  1530 +
  1531 + }
  1532 + });
  1533 +
  1534 + th.setData({
  1535 + def_pick_store: item,
  1536 + sto_sele_name: item.pickup_name,
  1537 + sto_sele_id: item.pickup_id,
  1538 + sto_sele_distr: item.distr_type,
  1539 + store: 0,
  1540 + choice_sort_store: 0
  1541 + });
  1542 +
  1543 + //4就是拼团
  1544 + th.setData({
  1545 + yijian: 1, //打开拼团购买界面
  1546 + store: 0, //关闭门店
  1547 + choice_sort_store: 0, //关闭门店2级
  1548 + sort_store: 0, //关闭门店2级
  1549 + });
  1550 +
  1551 + },
  1552 +
  1553 +
  1554 + //-- 关闭选择门店 --
  1555 + close_popup: function(e) {
  1556 + var th=this;
  1557 + this.setData({
  1558 + store: 0,
  1559 + choice_sort_store: 0,
  1560 + sort_store: 0,
  1561 + fir_pick_index:0,
  1562 + sec_pick_index:0,
  1563 + yijian: 1, //打开拼团购买界面
  1564 + })
  1565 +
  1566 + },
  1567 +
  1568 +
  1569 +
  1570 +
944 1571  
945 1572 })
946 1573 \ No newline at end of file
... ...
pages/team/team_show/team_show.wxml
  Edit  View file @dff3310
1 1 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
2 2 <!---- //文字"-->
3 3 <view wx:if="{{is_show}}">
4   -
5   - <!--图片区域-->
6   - <view class='center'>
7   - <view class='cenleft'>
8   - <image src='{{image}}' binderror='bind_bnerr' data-errorimg='image' ></image>
9   - </view>
10   - <view class='cenright'>
11   - <view class='cenrt'>
12   -
13   - <view class='xc-goods-details ellipsis-2 fs28'>
14   - <span>{{goods.goods_name}}</span>
15   - </view>
16   - </view>
17   - <view class='cenrcen flex-vertical-between'>
18   - <view>
19   - <view class="fs40 xc-wc" style='font-size:40rpx'>
20   - <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
21   - <view class="fs22 word-line xc-wc">
22   - 零售价￥{{goods.market_price}}
23   - </view>
24   - </view>
25   - <view class="xc-wc fs24">
26   - <view>
27   - <view class="">已拼{{teamlist.buy_num}}件</view>
28   - <view class="flex xc-valframe t-c">
29   - <view class="xc-frame-img">
30   - <image class="picture"src="{{imageurl}}/miniapp/images/bai-ren.png"></image>
31   - </view>
32   - <view style='margin-left:9rpx;'>
33   - {{teamlist.ct_num}}人拼
34   - </view>
35   - </view>
36   - </view>
37   - </view>
38   - </view>
39   - </view>
40   - </view>
41 4  
42   - <view class='body oh'>
43   - <!-- 等待团员 -->
44   - <!-- <view class='bodytop' wx:if="{{teamlist.kt_type==3}}"> -->
45   - <!-- 拼团成功 -->
46   - <view class="xc-ptcomplete flex-level fs28" wx:if="{{val==2}}">
47   -
48   - <view class="xc-wc">拼团成功</view>,为您节省<text class="xc-wc">25</text>元
49   - <view class="xc-img-frame oh" wx:if="{{val==2}}"><image class="img" src="{{imageurl}}/miniapp/images/xc_qtcg.png"></image> </view>
50   - </view>
51   - <!-- 拼团失败 -->
52   - <view class="xc-ptcomplete flex-level fs28" wx:if="{{val==3}}">
53   - <view class="xc-wc xc-end">拼团失败</view>
54   - <view class="xc-img-frames oh iw" wx:if="{{val==3}}"><image class="img " src="{{imageurl}}/miniapp/images/xc-qtshibai.png"></image> </view>
55   - </view>
56   - <!--头像-->
57   - <view class="flex_tou">
58   - <view class='bodyimg flex-level' wx:for="{{ordertx2}}" wx:key>
59   - <view class='d'>
60   - <image src='{{item.head_pic}}'></image>
61   - <span wx:if="{{item.is_pt_tz==1}}">团长</span>
62   - </view>
63   - </view>
64   - <view class='d' wx:for="{{sf_arr}}" >
65   - <image src='{{iurl}}/miniapp/images/shafa.png' style='width:100%; height:100%'></image>
66   - </view>
67   - <view class='xc-ellipsis-img' wx:if="{{ordertx.length>5}}">
68   - <image style='width:56rpx;height:56rpx;margin-left:10rpx;' src="{{imageurl}}/miniapp/images/xc_ellipsis.png"></image>
69   - </view>
  5 + <!--图片区域-->
  6 + <view class='center'>
  7 + <view class='cenleft'>
  8 + <image src='{{image}}' binderror='bind_bnerr' data-errorimg='image'></image>
  9 + </view>
  10 + <view class='cenright'>
  11 + <view class='cenrt'>
70 12  
71   -
72   - </view>
  13 + <view class='xc-goods-details ellipsis-2 fs28'>
  14 + <span>{{goods.goods_name}}</span>
  15 + </view>
  16 + </view>
  17 + <view class='cenrcen flex-vertical-between'>
  18 + <view>
  19 + <view class="fs40 xc-wc" style='font-size:40rpx'>
  20 + <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
  21 + <view class="fs22 word-line xc-wc">
  22 + 零售价￥{{goods.market_price}}
  23 + </view>
  24 + </view>
  25 + <view class="xc-wc fs24">
  26 + <view>
  27 + <view class="">已拼{{teamlist.buy_num}}件</view>
  28 + <view class="flex xc-valframe t-c">
  29 + <view class="xc-frame-img">
  30 + <image class="picture" src="{{imageurl}}/miniapp/images/bai-ren.png"></image>
  31 + </view>
  32 + <view style='margin-left:9rpx;'>
  33 + {{teamlist.ct_num}}人拼
  34 + </view>
  35 + </view>
  36 + </view>
  37 + </view>
  38 + </view>
  39 + </view>
  40 + </view>
73 41  
74   - <view class='bodytime'>
75   - <!--/ //旁边直线-->
76   - <view class='bodytimeleft'>
77   - <view class='xian'></view>
78   - </view>
79   - <!--/ // //时间-->
80   - <!--许程 <view class='bodytimecen' wx:if='{{obj}}'> -->
81   - <view class='bodytimecen'>
82   - 剩余
83   - <span wx:if="{{obj.day!=0}}"> {{obj.day}} </span>:
84   - <span> {{obj.hou}} </span>:
85   - <span> {{obj.min}} </span>:
86   - <span> {{obj.sec}} </span>结束
87   - </view>
88   -
  42 + <view class='body oh'>
  43 + <!-- 等待团员 -->
  44 + <!-- <view class='bodytop' wx:if="{{teamlist.kt_type==3}}"> -->
  45 + <!-- 拼团成功 -->
  46 + <view class="xc-ptcomplete flex-level fs28" wx:if="{{val==2}}">
89 47  
90   - <!----/ 旁边直线---->
91   - <view class='bodytimeright'>
92   - <view class='xian'></view>
93   - </view>
94   - </view>
95   -
96   - <view style='height:50rpx;width:100%' wx:if="{{val==1}}"></view>
  48 + <view class="xc-wc">拼团成功</view>,为您节省<text class="xc-wc">25</text>元
  49 + <view class="xc-img-frame oh" wx:if="{{val==2}}">
  50 + <image class="img" src="{{imageurl}}/miniapp/images/xc_qtcg.png"></image>
  51 + </view>
  52 + </view>
  53 + <!-- 拼团失败 -->
  54 + <view class="xc-ptcomplete flex-level fs28" wx:if="{{val==3}}">
  55 + <view class="xc-wc xc-end">拼团失败</view>
  56 + <view class="xc-img-frames oh iw" wx:if="{{val==3}}">
  57 + <image class="img " src="{{imageurl}}/miniapp/images/xc-qtshibai.png"></image>
  58 + </view>
  59 + </view>
  60 + <!--头像-->
  61 + <view class="flex_tou">
  62 + <view class='bodyimg flex-level' wx:for="{{ordertx2}}" wx:key>
  63 + <view class='d'>
  64 + <image src='{{item.head_pic}}'></image>
  65 + <span wx:if="{{item.is_pt_tz==1}}">团长</span>
  66 + </view>
  67 + </view>
  68 + <view class='d' wx:for="{{sf_arr}}">
  69 + <image src='{{iurl}}/miniapp/images/shafa.png' style='width:100%; height:100%'></image>
  70 + </view>
  71 + <view class='xc-ellipsis-img' wx:if="{{ordertx.length>5}}">
  72 + <image style='width:56rpx;height:56rpx;margin-left:10rpx;' src="{{imageurl}}/miniapp/images/xc_ellipsis.png"></image>
  73 + </view>
  74 +
  75 +
  76 + </view>
  77 +
  78 + <view class='bodytime'>
  79 + <!--/ //旁边直线-->
  80 + <view class='bodytimeleft'>
  81 + <view class='xian'></view>
  82 + </view>
  83 + <!--/ // //时间-->
  84 + <!--许程 <view class='bodytimecen' wx:if='{{obj}}'> -->
  85 + <view class='bodytimecen'>
  86 + 剩余
  87 + <span wx:if="{{obj.day!=0}}"> {{obj.day}} </span>:
  88 + <span> {{obj.hou}} </span>:
  89 + <span> {{obj.min}} </span>:
  90 + <span> {{obj.sec}} </span>结束
  91 + </view>
  92 +
  93 +
  94 + <!----/ 旁边直线---->
  95 + <view class='bodytimeright'>
  96 + <view class='xian'></view>
  97 + </view>
  98 + </view>
  99 +
  100 + <view style='height:50rpx;width:100%' wx:if="{{val==1}}"></view>
97 101 <!--如果团还没有满-->
98 102 <block wx:if="{{tg_arr==null}}">
99 103 <!--按钮-->
100   - <view wx:if="{{is_group_end==0}}" class='bodybutton white fs32' >
101   - <view class="xc-good-friend" bindtap='cyijian' data-isct="0">去参团</view>
102   - <view class="xc-home-page" bindtap='gohome'>返回首页</view>
  104 + <view wx:if="{{is_group_end==0}}" class='bodybutton white fs32'>
  105 + <view class="xc-good-friend" bindtap='cyijian' data-isct="0">去参团</view>
  106 + <view class="xc-home-page" bindtap='gohome'>返回首页</view>
103 107 </view>
104 108 <view wx:elif="{{teamlist.kttype>1}}" class='bodybutton' bindtap='cyijian' data-isct="1">
105   - <view class="xc-good-friend" >一键参团</view>
106   - <view class="xc-home-page" bindtap='gohome'>返回首页</view>
  109 + <view class="xc-good-friend">一键参团</view>
  110 + <view class="xc-home-page" bindtap='gohome'>返回首页</view>
107 111 </view>
108 112 <view wx:else class='bodybutton' bindtap='cyijian' data-isct="1">
109   - <view class="xc-good-friend" >一键参团</view>
110   - <view class="xc-home-page" bindtap='gohome'>返回首页</view>
  113 + <view class="xc-good-friend">一键参团</view>
  114 + <view class="xc-home-page" bindtap='gohome'>返回首页</view>
111 115 </view>
112 116 </block>
113 117 <block wx:else>
114   - <view class="show_zf_dd">
115   - <view>会员'{{tg_arr.user_name}}'待付款，若{{r_obj.min}}分{{r_obj.sec}}秒后该会员未支付您可以继续参团哦！</view>
116   - </view>
117   -
118   - <view class='bodybutton white fs32' >
119   - <view class="xc-good-friend co-w" data-isct="0">去参团</view>
120   - <view class="xc-home-page" bindtap='gohome'>返回首页</view>
121   - </view>
122   -
  118 + <view class="show_zf_dd">
  119 + <view>会员'{{tg_arr.user_name}}'待付款，若{{r_obj.min}}分{{r_obj.sec}}秒后该会员未支付您可以继续参团哦！</view>
  120 + </view>
  121 +
  122 + <view class='bodybutton white fs32'>
  123 + <view class="xc-good-friend co-w" data-isct="0">去参团</view>
  124 + <view class="xc-home-page" bindtap='gohome'>返回首页</view>
  125 + </view>
  126 +
123 127 </block>
124 128  
125   - </view>
126   - <!--展开拼团列表-->
127   - <view class='mck'>
128   - <view class='bodyfoot'>
129   - <view class='bodyselect' wx:if="{{zk}}" bindtap='czk'>
130   - <span>展开拼团列表
131   - <view class='down-arrow'></view>
132   - </span>
133   - </view>
134   - <!----收起拼团列表---->
135   - <view class='zhangxi' wx:if="{{hiddenName}}">
  129 + </view>
  130 + <!--展开拼团列表-->
  131 + <view class='mck'>
  132 + <view class='bodyfoot'>
  133 + <view class='bodyselect' wx:if="{{zk}}" bindtap='czk'>
  134 + <span>展开拼团列表
  135 + <view class='down-arrow'></view>
  136 + </span>
  137 + </view>
  138 + <!----收起拼团列表---->
  139 + <view class='zhangxi' wx:if="{{hiddenName}}">
136 140  
137   - <view class='zspan' bindtap='click'>收起拼团列表
138   - <view class='down-arrow1'></view>
139   - </view>
  141 + <view class='zspan' bindtap='click'>收起拼团列表
  142 + <view class='down-arrow1'></view>
  143 + </view>
140 144  
141   - <view class="ia" wx:for="{{ordertx}}" wx:for-index="ky">
142   - <view class='img'>
143   - <image src='{{item.head_pic}}'></image>
144   - <span>{{item.nickname}}</span>
145   - </view>
146   - <view class='zssj' wx:if="{{ky==0}}">{{item.add_time_date}} 开团</view>
147   - <view class='zssj' wx:else>{{item.add_time_date}} 参团</view>
148   - </view>
149   - </view>
150   - </view>
151   - </view>
152   - <!----//拼团玩法---->
153   - <view class='pintuan' bindtap="cpd">
154   - <view class='pintuanzhou'>拼团玩法</view>
155   - <view class='pintuanyou'>开团/参团＞邀请参团＞人满成团</view>
156   - </view>
157   - <!--大家都在团-->
158   - <view class='goodslist'>
159   - <view class='goodslisttop'>
160   - <span class='goodslistspan'>大家都在团</span>
161   - <view class='goodslisttopright'></view>
162   - </view>
163   - <view class="changxin">
164   - <view class='onegoods' wx:for='{{pageteam}}' wx:key="{{index}}" bindtap="go_goodsinfo" data-gid="{{item.goods_id}}">
165   - <view class='onegoodsimg'>
166   - <image src="{{imageurl+item.share_imgurl}}"></image>
167   - </view>
168   - <view class='onegoodsdesc'>
169   - <text>{{item.goods_name}}</text>
170   - </view>
171   - <view class='price'>
172   - <view class='jgleft'>¥{{item.price}}</view>
173   - <view class='jgright'>{{item.ct_num}}人
174   - <span>参团</span>
175   - </view>
176   - </view>
177   - </view>
178   - </view>
179   - </view>
  145 + <view class="ia" wx:for="{{ordertx}}" wx:for-index="ky">
  146 + <view class='img'>
  147 + <image src='{{item.head_pic}}'></image>
  148 + <span>{{item.nickname}}</span>
  149 + </view>
  150 + <view class='zssj' wx:if="{{ky==0}}">{{item.add_time_date}} 开团</view>
  151 + <view class='zssj' wx:else>{{item.add_time_date}} 参团</view>
  152 + </view>
  153 + </view>
  154 + </view>
  155 + </view>
  156 + <!----//拼团玩法---->
  157 + <view class='pintuan' bindtap="cpd">
  158 + <view class='pintuanzhou'>拼团玩法</view>
  159 + <view class='pintuanyou'>开团/参团＞邀请参团＞人满成团</view>
  160 + </view>
  161 + <!--大家都在团-->
  162 + <view class='goodslist'>
  163 + <view class='goodslisttop'>
  164 + <span class='goodslistspan'>大家都在团</span>
  165 + <view class='goodslisttopright'></view>
  166 + </view>
  167 + <view class="changxin">
  168 + <view class='onegoods' wx:for='{{pageteam}}' wx:key="{{index}}" bindtap="go_goodsinfo" data-gid="{{item.goods_id}}">
  169 + <view class='onegoodsimg'>
  170 + <image src="{{imageurl+item.share_imgurl}}"></image>
  171 + </view>
  172 + <view class='onegoodsdesc'>
  173 + <text>{{item.goods_name}}</text>
  174 + </view>
  175 + <view class='price'>
  176 + <view class='jgleft'>¥{{item.price}}</view>
  177 + <view class='jgright'>{{item.ct_num}}人
  178 + <span>参团</span>
  179 + </view>
  180 + </view>
  181 + </view>
  182 + </view>
  183 + </view>
180 184 </view>
181 185  
182 186 <!--弹出购物模块-->
183 187 <view class="pop_up" wx:if="{{yijian}}">
184   - <view class='buy-option'>
185   - <!--头部图片-->
186   - <view class='buy-top'>
  188 + <view>
  189 +
  190 + <!----弹起来,选择规格数量,拼单商品购买------>
  191 + <!-- <view> -->
  192 + <!-- <view hidden="{{!openSpecModal_pt}}"> -->
  193 + <view bindtap="closeSpecModal" class="cover-layer"></view>
  194 + <view class="spec-model">
  195 + <view class="pding">
  196 + <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
  197 + <!-- 商品名称 -->
  198 + <view class="spec-goods">
  199 + <image class="wh100 spec-img xc-distance-bottom" src="{{image}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
  200 + <view class="spec-goods-info">
  201 + <view class="spec-goods-name ellipsis-1">{{goods.goods_name}}商品名称</view>
  202 + <view class="flex ai_end xc-val-money">
  203 + <view class="spec-goods-price">
  204 + <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
  205 + </view>
  206 + </view>
  207 + <view class="flex">
  208 + <view class="spec-goods-stock">已售：{{teamlist.buy_num}}</view>
  209 + <view class="spec-goods-stock">可售：{{teamlist.goods_num-teamlist.buy_num}}</view>
  210 + </view>
  211 + </view>
  212 + </view>
  213 +
  214 + <view style="clear: both"></view>
  215 + <view style="margin-top: 20rpx">
  216 + <view class="flex-space-between address ai_end xc-width ">
  217 +
  218 + <view class="flex ai_end" wx:if="{{def_pick_store}}">
  219 + <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
  220 +
  221 + <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
  222 + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  223 + </view>
  224 + </view>
  225 + <view class="red-co fs28" bindtap="choice_store" wx:if="{{def_pick_store}}">
  226 + 更多门店
  227 + <text class="right-arrow"></text>
  228 + </view>
  229 + <view class="flex" bindtap="choice_store" wx:else>
  230 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  231 + <view class="fs28 xc-ash-9f">选择门店</view>
  232 + </view>
  233 +
  234 +
  235 + </view>
  236 + <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store}}">地址:5{{def_pick_store.fulladdress}}</view>
  237 +
  238 + </view>
  239 + <!-- 商品的属性项目 -->
  240 + <view>
  241 + <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
  242 + <block>
  243 + <view hidden="{{ismend==1}}" class="flex">
  244 + <view class="spec_bt act" >{{goods.gg}}
  245 + </view>
  246 + </view>
  247 + </block>
  248 + <view class="clear"></view>
  249 + </view>
  250 +
  251 + <view>
  252 + <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx">
  253 + <view>购买数量</view>
  254 + <view class="count">
  255 + <view class='{{minusStatus}}' bindtap="bindMinus" class="sub">-</view>
  256 + <input bindblur="bindManual" class="xc-val-fream" type="number" value="1">1</input>
  257 + <view bindtap="bindPlus" class="add">+</view>
  258 + </view>
  259 + </view>
  260 +
  261 + <view class="clear"></view>
  262 +
  263 + </view>
  264 + </view>
  265 +
  266 + <view class="pt_qd">
  267 + <view bindtap="go_pay" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
  268 + </view>
  269 +
  270 + </view>
  271 + <!-- </view> -->
  272 +
  273 + </view>
  274 +</view>
  275 +
  276 +<!-- 选择门店的弹框，1.1版最新的 -->
  277 +<block wx:if="{{store==1}}">
  278 + <view class="mongolia-layer" bindtap="close_popup"></view>
  279 + <view class="popup-frame">
  280 + <block wx:if="{{sort_store==0}}">
  281 + <!-- 头部 标题 -->
  282 + <view class="popup-top flex-space-between">
  283 + <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
  284 + <view>
  285 + <view>
  286 + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
  287 + </view>
  288 + <view class="felx choose_more" bindtap="more_store">
  289 + <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
  290 + <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
  291 + </view>
  292 + </view>
  293 + </view>
  294 + <!-- 门店列表，最外层的门店列表，一开始 -->
  295 + <view class="store-list">
  296 + <!--如果还没有点击更多门店的时候 -->
  297 + <block wx:if="{{choice_sort_store==0}}">
  298 + <!-- 需要for循环 -->
  299 + <block wx:if="{{is_show_sto_cat==1}}">
  300 + <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
  301 + <view class="store flex-vertical">
  302 + <!-- 需要点击事件 -->
  303 + <block wx:if="{{index==fir_pick_index}}">
  304 + <view class="circle white xc-hook fs20 red-b">Г</view>
  305 + </block>
  306 + <block wx:else>
  307 + <view class="circle xc-hooks"></view>
  308 + </block>
  309 + <view class="address-frame xc-ash">
  310 + <view class="flex-vertical-between butttem5">
  311 + <view class="flex xc-ash">
  312 + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
  313 + </view>
  314 + <view>
  315 + <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
  316 + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
  317 + </view>
  318 + </view>
  319 + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
  320 + </view>
  321 + </view>
  322 + </view>
  323 + </block>
  324 + <block wx:else>
  325 + <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
  326 + <view class="store flex-vertical">
  327 + <!-- 需要点击事件 -->
  328 + <block wx:if="{{index==fir_pick_index}}" >
  329 + <view class="circle white xc-hook fs20 red-b">Г</view>
  330 + </block>
  331 + <block wx:else>
  332 + <view class="circle xc-hooks"></view>
  333 + </block>
  334 +
  335 + <view class="address-frame xc-ash">
  336 + <view class="flex-vertical-between ">
  337 + <view class="flex xc-ash">
  338 + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
  339 + </view>
  340 + <view>
  341 + <view class="distance fs24 address-val"
  342 + wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
  343 + </view>
  344 + </view>
  345 + </view>
  346 + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
  347 + </view>
  348 + </view>
  349 + </view>
  350 + </block>
  351 + </block>
  352 + <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店 -->
  353 + <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
  354 + <view class="store flex-vertical">
  355 + <!-- 需要点击事件 -->
  356 + <block wx:if="{{index==sec_pick_index}}">
  357 + <view class="circle white xc-hook fs20 red-b">Г</view>
  358 + </block>
  359 + <block wx:else>
  360 + <view class="circle xc-hooks"></view>
  361 + </block>
  362 +
  363 + <view class="address-frame xc-ash">
  364 + <view class="flex-vertical-between ">
  365 + <view class="flex xc-ash">
  366 + <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
  367 + </view>
  368 + <view>
  369 + <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
  370 + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
  371 + </view>
  372 + </view>
  373 + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
  374 + </view>
  375 + </view>
  376 + </view>
  377 + </block>
  378 +
  379 + </view>
  380 +
  381 + <!-- 门店列表底部 -->
  382 + <view class="store-bottom-frame">
  383 + <view class="store-bottom flex-vertical-between">
  384 + <view class="determine red-b fs28 white t-c" bindtap="sure_pick"
  385 + data-openindstore="{{open_ind_store}}">确定</view>
  386 + <view class="default t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view>
  387 + </view>
  388 + </view>
  389 +
  390 + </block>
  391 +
  392 +
  393 + <block wx:else>
  394 + <view class="popup-top flex-space-between">
  395 + <text class="fs32 nearby_store">门店分类选择</text>
  396 + <view>
  397 + <view>
  398 + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
  399 + </view>
  400 + <view class="felx choose_mores" bindtap="returns">
  401 + <text class="fs26 red-co">返回</text>
  402 + </view>
  403 + </view>
  404 + </view>
  405 + <view class="sort_store_list">
  406 +
  407 + <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
  408 + <view class="sort-store flex-vertical-between" >
  409 + <view class="fs30" di>{{item.name}}</view>
  410 + <view class="black_rights-frame">
  411 + <view class="black_rights"></view>
  412 + </view>
  413 + </view>
  414 + </view>
  415 +
  416 + </view>
  417 + </block>
  418 + </view>
  419 +</block>
  420 +
  421 +
  422 +
  423 +
  424 +
  425 +
  426 +<!-- <view class='buy-option'> -->
  427 +<!--头部图片-->
  428 +<!-- <view class='buy-top'>
187 429 <view class='buy-image mimg'>
188 430 <image src='{{image}}'></image>
189 431 <view>
... ... @@ -199,20 +441,20 @@
199 441  
200 442 <view class='buy-cou' bindtap='cbcou'>⊗</view>
201 443 <view class='clear'></view>
202   - </view>
  444 + </view> -->
203 445  
204   - <!--取货门店-->
205   - <view class='quhuo' wx:if="{{qh}}" bindtap='cqh'>
206   - <!--当ii==0请选择门店显示，ii==1最后名字显示-->
207   - <text>取货门店</text><view class='end_name' wx:if="{{ii==1 }}">({{end_name}})</view><view wx:if="{{ii==0 }}" class='ttxz'>(请选择门店)</view>
208   - </view>
209   - <!--选择门店-->
210   - <view class='xuanze1' wx:if="{{xz}}" bindtap='cxz'>
  446 +<!--取货门店-->
  447 +<!-- <view class='quhuo' wx:if="{{qh}}" bindtap='cqh'> -->
  448 +<!--当ii==0请选择门店显示，ii==1最后名字显示-->
  449 +<!-- <text>取货门店</text><view class='end_name' wx:if="{{ii==1 }}">({{end_name}})</view><view wx:if="{{ii==0 }}" class='ttxz'>(请选择门店)</view>
  450 + </view> -->
  451 +<!--选择门店-->
  452 +<!-- <view class='xuanze1' wx:if="{{xz}}" bindtap='cxz'>
211 453 <text decode='true'>&lt; 选择门店</text>
212 454 </view>
213   - <view class='x-z'>
214   - <!--第一层-->
215   - <block wx:if="{{one}}">
  455 + <view class='x-z'> -->
  456 +<!--第一层-->
  457 +<!-- <block wx:if="{{one}}">
216 458 <view class="fir_view">
217 459 <view>
218 460 <view class='xuanze' bindtap='setchild' data-bindex='{{bindex}}' data-bname='{{item.name}}' wx:for-index="bindex" wx:for="{{ssl}}" wx:key>
... ... @@ -220,11 +462,11 @@
220 462 </view>
221 463 </view>
222 464 </view>
223   - </block>
224   - <!--选择的-->
225   - <view class='xuanze1' wx:if="{{se}}" bindtap='sel'><text decode='true'>&lt;</text> {{sele_dl_name}}</view>
226   - <!--第二层list-->
227   - <block wx:if="{{list}}">
  465 + </block> -->
  466 +<!--选择的-->
  467 +<!-- <view class='xuanze1' wx:if="{{se}}" bindtap='sel'><text decode='true'>&lt;</text> {{sele_dl_name}}</view> -->
  468 +<!--第二层list-->
  469 +<!-- <block wx:if="{{list}}">
228 470 <scroll-view scroll-y="true" style="max-height: 460rpx">
229 471 <view class='xuanze' wx:for="{{ssl_child}}" wx:key bindtap='clist'
230 472 data-pick_dis="{{item.distr_type}}"
... ... @@ -233,10 +475,10 @@
233 475 </view>
234 476 </scroll-view>
235 477 </block>
236   - </view>
  478 + </view> -->
237 479  
238   - <!--数量-->
239   - <view class='buy-button' wx:if="{{qh}}">
  480 +<!--数量-->
  481 +<!-- <view class='buy-button' wx:if="{{qh}}">
240 482 <text>数量</text>
241 483 <view class='stepper sum'>
242 484 <text class='{{minusStatus}}' type='number' bindtap='bindMinus' class="jiajian">-</text>
... ... @@ -244,49 +486,53 @@
244 486 <text bindtap='bindPlus' class="jiajian">+</text>
245 487 </view>
246 488 <view class='clear'></view>
247   - </view>
  489 + </view> -->
  490 +
  491 +<!-- <view class="clear"></view>
  492 + </view> -->
  493 +<!--支付-->
  494 +<!-- <view class='btn' bindtap="go_pay">立即支付</view> -->
  495 +<!-- </view>
  496 +</view> -->
248 497  
249   - <view class="clear"></view>
250   - </view>
251   - <!--支付-->
252   - <view class='btn' bindtap="go_pay">立即支付</view>
253   -</view>
254 498 <!--mask吐司内容-->
255 499 <view class="toast_mask" wx:if="{{isShowToast}}"></view>
  500 +
256 501 <!--以下为toast显示的内容-->
257 502 <view class="toast_content_box" wx:if="{{isShowToast}}">
258   - <view class="toast_content">
259   - <view class="toast_content_text">
260   - {{toastText}}
261   - </view>
262   - </view>
  503 + <view class="toast_content">
  504 + <view class="toast_content_text">
  505 + {{toastText}}
  506 + </view>
  507 + </view>
263 508 </view>
  509 +
264 510 <!--拼团玩法弹出框-->
265 511 <!----弹起的---->
266 512 <block wx:if="{{pd_xx}}">
267   - <view class="bview"></view>
268   - <view class="juzhong">
269   - <view class="xq">
270   - <view class="title" bindtap="close_pt_xx">拼团玩法介绍
271   - <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image>
272   - </view>
273   - <view>1.开团：
274   - <text class="hs1">选择心仪商品，点击“发起X人团”按钮，付款后即为开团成功；</text>
275   - </view>
276   - <view>2.参团：
277   - <text class="hs1">进入朋友分享的页面，点击“立即参团”按钮，付款后即为参团成功，若多人同时支付，支付成功时间较早的人获得参团资格；</text>
278   - </view>
279   - <view>3.成团：
280   - <text class="hs1">在开团或参团成功后，点击“邀请小伙伴参团”将页面分享给好友，在有效时间内凑齐人数即为成团，此时商家会开始发货；</text>
281   - </view>
282   - <view>4.组团失败：
283   - <text class="hs1">在有效时间内未凑齐人数，即为组团失败，此时付款项会原路退回到支付账户；</text>
284   - </view>
285   - <view>5.
286   - <text class="hs1">组团有效期间内，拼购商品订单不允许取消。 </text>
287   - </view>
288   - </view>
289   - </view>
  513 + <view class="bview"></view>
  514 + <view class="juzhong">
  515 + <view class="xq">
  516 + <view class="title" bindtap="close_pt_xx">拼团玩法介绍
  517 + <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image>
  518 + </view>
  519 + <view>1.开团：
  520 + <text class="hs1">选择心仪商品，点击“发起X人团”按钮，付款后即为开团成功；</text>
  521 + </view>
  522 + <view>2.参团：
  523 + <text class="hs1">进入朋友分享的页面，点击“立即参团”按钮，付款后即为参团成功，若多人同时支付，支付成功时间较早的人获得参团资格；</text>
  524 + </view>
  525 + <view>3.成团：
  526 + <text class="hs1">在开团或参团成功后，点击“邀请小伙伴参团”将页面分享给好友，在有效时间内凑齐人数即为成团，此时商家会开始发货；</text>
  527 + </view>
  528 + <view>4.组团失败：
  529 + <text class="hs1">在有效时间内未凑齐人数，即为组团失败，此时付款项会原路退回到支付账户；</text>
  530 + </view>
  531 + <view>5.
  532 + <text class="hs1">组团有效期间内，拼购商品订单不允许取消。 </text>
  533 + </view>
  534 + </view>
  535 + </view>
290 536 </block>
291 537  
292   -<warn id="warn"></warn>
293 538 \ No newline at end of file
  539 +<warn id="warn"></warn>
... ...
pages/team/team_show/team_show.wxss
  Edit  View file @dff3310
1 1 page {
2   - background-color: #eee;
  2 + background-color: #eee;
3 3 }
4 4  
5 5 .top {
6   - background-color: rgb(216, 230, 220);
7   - color: rgb(98, 155, 13);
8   - text-align: center;
9   - height: 110rpx;
10   - width: 100%;
  6 + background-color: rgb(216, 230, 220);
  7 + color: rgb(98, 155, 13);
  8 + text-align: center;
  9 + height: 110rpx;
  10 + width: 100%;
11 11 }
12 12  
13 13 .center {
14   - height: 240rpx;
15   - width: 100%;
16   - background:#fff;
  14 + height: 240rpx;
  15 + width: 100%;
  16 + background: #fff;
17 17 }
18 18  
19 19 .cenleft {
20   - width: 240rpx;
21   - height: 100%;
22   - float: left;
23   - display: flex;
24   - justify-content: center;
25   - align-items: center;
  20 + width: 240rpx;
  21 + height: 100%;
  22 + float: left;
  23 + display: flex;
  24 + justify-content: center;
  25 + align-items: center;
26 26 }
27 27  
28 28 .cenleft image {
29   - background-color: white;
30   - width: 200rpx;
31   - height: 200rpx;
  29 + background-color: white;
  30 + width: 200rpx;
  31 + height: 200rpx;
32 32 }
33 33  
34 34 .cenrt {}
35   -.cenright { height: 100%;width:auto;float: left;}
  35 +
  36 +.cenright {
  37 + height: 100%;
  38 + width: auto;
  39 + float: left;
  40 +}
36 41  
37 42 .cenrtoptitle {
38   - float: left;
39   - width: 240rpx;
40   - height: 40rpx;
41   - margin-left: 12rpx;
42   - font-size: 28rpx;
43   - margin-top: 12rpx;
  43 + float: left;
  44 + width: 240rpx;
  45 + height: 40rpx;
  46 + margin-left: 12rpx;
  47 + font-size: 28rpx;
  48 + margin-top: 12rpx;
44 49 }
45 50  
46 51 .cenrcen {
47   - height: 70rpx;
48   - margin-top: 35rpx;
49   - width: 479rpx;
  52 + height: 70rpx;
  53 + margin-top: 35rpx;
  54 + width: 479rpx;
50 55 }
51 56  
52 57 .jg {
53   - font-size: 40rpx;
54   - margin-right: 30rpx;
  58 + font-size: 40rpx;
  59 + margin-right: 30rpx;
55 60 }
56 61  
57 62 .jgx {
58   - font-size: 24rpx;
59   - color: #777;
60   - text-decoration: line-through;
61   - margin-top: 12rpx;
  63 + font-size: 24rpx;
  64 + color: #777;
  65 + text-decoration: line-through;
  66 + margin-top: 12rpx;
62 67 }
63 68  
64 69 .cenrfoot {
65   - align-content: center;
66   - text-align: center;
67   - border: 2rpx solid red;
68   - border-radius: 10rpx;
69   - color: red;
70   - float: left;
71   - font-size: 24rpx;
72   - padding: 4rpx 16rpx;
73   - margin-top: 12rpx;
  70 + align-content: center;
  71 + text-align: center;
  72 + border: 2rpx solid red;
  73 + border-radius: 10rpx;
  74 + color: red;
  75 + float: left;
  76 + font-size: 24rpx;
  77 + padding: 4rpx 16rpx;
  78 + margin-top: 12rpx;
74 79 }
75 80  
76 81 .body {
77   - background-color: white;
78   - height: 472rpx;
79   - width: 100%;
80   - margin-top: 4rpx;
  82 + background-color: white;
  83 + height: 472rpx;
  84 + width: 100%;
  85 + margin-top: 4rpx;
81 86 }
82 87  
83 88 .d {
84   - font-size: 24rpx;
  89 + font-size: 24rpx;
85 90 }
86 91  
87 92 .bodytop {
88   - background-color: white;
89   - text-align: center;
90   - font-size: 28rpx;
91   - padding-top: 16rpx;
92   - height:90rpx;
  93 + background-color: white;
  94 + text-align: center;
  95 + font-size: 28rpx;
  96 + padding-top: 16rpx;
  97 + height: 90rpx;
93 98  
94 99 }
95 100  
96 101 .bodytop span {
97   - color: red;
  102 + color: red;
98 103 }
99 104  
100 105 .bodyimg {
101   - height: 155rpx;
102   - /* display: flex;
  106 + height: 155rpx;
  107 + /* display: flex;
103 108 justify-content: center;
104 109 align-items: center; */
105 110  
... ... @@ -107,1097 +112,2063 @@ page {
107 112 }
108 113  
109 114 .bodyimg image {
110   - border-radius: 50rpx;
111   - height:96rpx;
112   - width:96rpx;
113   - margin-top: 30rpx;
114   - position: absolute;
  115 + border-radius: 50rpx;
  116 + height: 96rpx;
  117 + width: 96rpx;
  118 + margin-top: 30rpx;
  119 + position: absolute;
115 120  
116 121 }
117 122  
118 123 .d {
119   - width:101rpx;
120   - height:101rpx;
121   - display: inline-block;
122   -
  124 + width: 101rpx;
  125 + height: 101rpx;
  126 + display: inline-block;
  127 +
123 128 }
124 129  
125 130 .bodyimg span {
126   - background-color: #e22b44;
127   - color: white;
128   - font-size: 24rpx;
129   - border-radius: 6rpx;
130   - padding: 3rpx 10rpx;
131   - position: relative;
132   - top: 8px;
133   - left: 40rpx;
  131 + background-color: #e22b44;
  132 + color: white;
  133 + font-size: 24rpx;
  134 + border-radius: 6rpx;
  135 + padding: 3rpx 10rpx;
  136 + position: relative;
  137 + top: 8px;
  138 + left: 40rpx;
134 139 }
135 140  
136 141 .bodyspan {
137   - color: red;
138   - text-align: center;
139   - font-size: 24rpx;
  142 + color: red;
  143 + text-align: center;
  144 + font-size: 24rpx;
140 145 }
141 146  
142 147 .bodytime {
143   - height: 55rpx;
144   - width: 100%;
145   - display: flex;
146   - flex-wrap: nowrap;
147   - padding-left:40rpx;
148   -align-items:center;
  148 + height: 55rpx;
  149 + width: 100%;
  150 + display: flex;
  151 + flex-wrap: nowrap;
  152 + padding-left: 40rpx;
  153 + align-items: center;
149 154  
150 155 }
151 156  
152 157 .bodytimeleft {
153   - text-decoration: line-through;
154   - flex-grow: 1.7;
  158 + text-decoration: line-through;
  159 + flex-grow: 1.7;
155 160 }
156 161  
157 162 .bodytimecen {
158   - text-align: center;
159   - flex-grow: 1;
  163 + text-align: center;
  164 + flex-grow: 1;
160 165  
161   - font-size:30rpx;
162   - color: #000;
163   - width:415rpx;
  166 + font-size: 30rpx;
  167 + color: #000;
  168 + width: 415rpx;
164 169  
165 170 }
166 171  
167 172 .bodytimecen span {
168   - background-color: #333333;
169   - color: white;
170   - border-radius: 7rpx;
171   - padding-left: 20rpx;
172   - font-size: 30rpx;
173   - margin: 0 auto;
174   - padding-right:10rpx;
175   -margin-right:5px;
  173 + background-color: #333333;
  174 + color: white;
  175 + border-radius: 7rpx;
  176 + padding-left: 20rpx;
  177 + font-size: 30rpx;
  178 + margin: 0 auto;
  179 + padding-right: 10rpx;
  180 + margin-right: 5px;
  181 +
176 182  
177   -
178 183 }
179 184  
180 185 .bodytimecen span:last-child {
181   - margin-right: 10rpx;
  186 + margin-right: 10rpx;
182 187  
183 188 }
184 189  
185 190 .bodytimeright {
186   -flex-grow:1.7;
187   - margin-right:72rpx;
  191 + flex-grow: 1.7;
  192 + margin-right: 72rpx;
188 193  
189 194 }
190 195  
191 196 .bodybutton {
192   - min-height: 170rpx;
193   - width: 90%;
194   - margin: 0 auto;
195   - text-align: center;
  197 + min-height: 170rpx;
  198 + width: 90%;
  199 + margin: 0 auto;
  200 + text-align: center;
196 201 line-height: 70rpx;
197   - border-radius:15rpx;
198   - height: auto;
199   - padding-top:38rpx
200   -
  202 + border-radius: 15rpx;
  203 + height: auto;
  204 + padding-top: 38rpx
201 205 }
202 206  
203 207 .bodybutton button {
204   - height: 100%;
205   - width: 100%;
206   - background-color: red;
207   - color: white;
208   - font-size: 32rpx;
  208 + height: 100%;
  209 + width: 100%;
  210 + background-color: red;
  211 + color: white;
  212 + font-size: 32rpx;
209 213 }
210 214  
211   -.bodybutton.co-w{
212   - color: #333;
213   - background-color:#adadad;
214   - font-size: 32rpx;
215   -
  215 +.bodybutton.co-w {
  216 + color: #333;
  217 + background-color: #adadad;
  218 + font-size: 32rpx;
  219 +
216 220 }
217 221  
218 222  
219 223  
220 224 .bodyfoot {
221   - width: 100%;
222   - text-align: center;
223   - font-size: 28rpx;
224   - color: #777;
225   - background-color: white;
  225 + width: 100%;
  226 + text-align: center;
  227 + font-size: 28rpx;
  228 + color: #777;
  229 + background-color: white;
226 230 }
227 231  
228 232 .pintuan {
229   - width: 100%;
230   - height: 84rpx;
231   - background-color: white;
232   - color: black;
233   - text-align: center;
234   - font-size: 36rpx;
235   - margin-top: 0rpx;
  233 + width: 100%;
  234 + height: 84rpx;
  235 + background-color: white;
  236 + color: black;
  237 + text-align: center;
  238 + font-size: 36rpx;
  239 + margin-top: 0rpx;
236 240 }
237 241  
238 242  
239 243 .pintuanzhou {
240   - float: left;
241   - line-height: 84rpx;
242   - width: 226rpx;
243   - background: url('https://mshopimg.yolipai.net/miniapp/images/user/wh.png') no-repeat right center;
244   - background-size: 42rpx;
245   - margin-left: -18rpx;
246   - font-size: 32rpx;
  244 + float: left;
  245 + line-height: 84rpx;
  246 + width: 226rpx;
  247 + background: url('https://mshopimg.yolipai.net/miniapp/images/user/wh.png') no-repeat right center;
  248 + background-size: 42rpx;
  249 + margin-left: -18rpx;
  250 + font-size: 32rpx;
247 251 }
248 252  
249 253 .pintuanyou {
250   - float: right;
251   - color: rgb(168, 167, 167);
252   - line-height: 84rpx;
253   - font-size: 32rpx;
254   - margin-right: 24rpx;
  254 + float: right;
  255 + color: rgb(168, 167, 167);
  256 + line-height: 84rpx;
  257 + font-size: 32rpx;
  258 + margin-right: 24rpx;
255 259 }
256 260  
257 261 .onegoods {
258   - background-color: white;
259   - width: 372rpx;
260   - height: 560rpx;
261   - border-left: 2rpx solid #eee;
262   - float: left;
  262 + background-color: white;
  263 + width: 372rpx;
  264 + height: 560rpx;
  265 + border-left: 2rpx solid #eee;
  266 + float: left;
263 267 }
264 268  
265 269 .goodsl {
266   - background-color: white;
  270 + background-color: white;
267 271 }
268 272  
269 273 .onegoodsimg {
270   - width: 100%;
271   - height: 360rpx;
272   - margin-bottom: 20rpx;
  274 + width: 100%;
  275 + height: 360rpx;
  276 + margin-bottom: 20rpx;
273 277 }
274 278  
275 279 .onegoodsimg image {
276   - height: 100%;
277   - width: 100%;
  280 + height: 100%;
  281 + width: 100%;
278 282 }
279 283  
280 284 .onegoodsdesc {
281   - color: rgb(168, 167, 167);
282   - padding-left: 20rpx;
283   - height: 100rpx;
284   - font-size: 32rpx;
285   - width: 92%;
286   - line-height: 100rpx;
287   - overflow: hidden;
288   - text-overflow: ellipsis;
289   - white-space: nowrap;
290   - padding-right: 20rpx;
  285 + color: rgb(168, 167, 167);
  286 + padding-left: 20rpx;
  287 + height: 100rpx;
  288 + font-size: 32rpx;
  289 + width: 92%;
  290 + line-height: 100rpx;
  291 + overflow: hidden;
  292 + text-overflow: ellipsis;
  293 + white-space: nowrap;
  294 + padding-right: 20rpx;
291 295 }
292 296  
293   -.onegoodsdesc text {
294   -}
  297 +.onegoodsdesc text {}
295 298  
296 299 .price {
297   - color: red;
298   - width: 100%;
  300 + color: red;
  301 + width: 100%;
299 302 }
300 303  
301 304 .jgleft {
302   - float: left;
303   - width: 100rpx;
304   - margin-left: 20rpx;
305   - font-size: 40rpx;
306   - margin-top: -8rpx;
  305 + float: left;
  306 + width: 100rpx;
  307 + margin-left: 20rpx;
  308 + font-size: 40rpx;
  309 + margin-top: -8rpx;
307 310 }
308 311  
309 312 .jgright {
310   - font-size: 28rpx;
311   - float: right;
312   - width: 120rpx;
  313 + font-size: 28rpx;
  314 + float: right;
  315 + width: 120rpx;
313 316 }
314 317  
315 318 .jgright span {
316   - color: rgb(168, 167, 167);
  319 + color: rgb(168, 167, 167);
317 320 }
318 321  
319 322 .goodslisttop {
320   - background-color: white;
321   - width: 100%;
  323 + background-color: white;
  324 + width: 100%;
322 325 }
323 326  
324 327 .goodslist {
325   - background-color: white;
  328 + background-color: white;
326 329 }
327 330  
328 331 .goodslisttop {
329   - background-color: white;
330   - width: 100%;
331   - height: 80rpx;
332   - margin-top: 20rpx;
333   - text-align: center;
  332 + background-color: white;
  333 + width: 100%;
  334 + height: 80rpx;
  335 + margin-top: 20rpx;
  336 + text-align: center;
334 337 }
335 338  
336 339 .goodslistspan {
337   - margin: 0 auto;
338   - padding-top: 20rpx;
339   - display: inline-block;
340   - padding: 0 10px;
341   - background: #fff;
342   - margin-top: 12rpx;
343   - font-size: 28rpx;
344   - color: rgb(168, 167, 167);
  340 + margin: 0 auto;
  341 + padding-top: 20rpx;
  342 + display: inline-block;
  343 + padding: 0 10px;
  344 + background: #fff;
  345 + margin-top: 12rpx;
  346 + font-size: 28rpx;
  347 + color: rgb(168, 167, 167);
345 348 }
346 349  
347 350 .xian {
348   - height: 50%;
349   - width: 100%;
350   - border-bottom: 4rpx solid #eee;
351   - float: left;
  351 + height: 50%;
  352 + width: 100%;
  353 + border-bottom: 4rpx solid #eee;
  354 + float: left;
352 355 }
353 356  
354 357 .bodyselect {
355   - height: 50px;
356   - background-color: white;
357   - width: 100%;
358   - line-height: 50px;
359   - font-size: 28rpx;
  358 + height: 50px;
  359 + background-color: white;
  360 + width: 100%;
  361 + line-height: 50px;
  362 + font-size: 28rpx;
360 363 }
361 364  
362 365 .changxin {
363   - float: left;
364   - width: 100%;
  366 + float: left;
  367 + width: 100%;
365 368 }
366 369  
367 370 .zhangxi {
368   - width: 100%;
369   - min-height: 100rpx;
370   - background-color: white;
371   - color: black;
  371 + width: 100%;
  372 + min-height: 100rpx;
  373 + background-color: white;
  374 + color: black;
372 375 }
373 376  
374 377 .img {
375   - width: 30%;
376   - height: 100rpx;
377   - margin-bottom: 0rpx;
378   - color: black;
379   - margin-left: 36rpx;
380   - font-size: 26rpx;
381   - display: flex;
  378 + width: 30%;
  379 + height: 100rpx;
  380 + margin-bottom: 0rpx;
  381 + color: black;
  382 + margin-left: 36rpx;
  383 + font-size: 26rpx;
  384 + display: flex;
382 385 }
383 386  
384 387 .img span {
385   - height: 100rpx;
386   - display: block;
387   - line-height: 100rpx;
388   - text-overflow: ellipsis;
389   - white-space: nowrap;
390   - overflow: hidden;
391   - padding: 0rpx;
392   - width: 120rpx;
  388 + height: 100rpx;
  389 + display: block;
  390 + line-height: 100rpx;
  391 + text-overflow: ellipsis;
  392 + white-space: nowrap;
  393 + overflow: hidden;
  394 + padding: 0rpx;
  395 + width: 120rpx;
393 396 }
394 397  
395 398 .zhangxi image {
396   - border-radius: 50rpx;
397   - height: 80rpx;
398   - width: 80rpx;
399   - float: left;
400   - margin-top: 12rpx;
401   - background-color: red;
402   - margin-right: 10rpx;
  399 + border-radius: 50rpx;
  400 + height: 80rpx;
  401 + width: 80rpx;
  402 + float: left;
  403 + margin-top: 12rpx;
  404 + background-color: red;
  405 + margin-right: 10rpx;
403 406 }
404 407  
405 408 .zhangxi .zssj {
406   - height: 100rpx;
407   - width: 70%;
408   - margin-right: 40rpx;
409   - line-height: 100rpx;
410   - font-size: 26rpx;
411   - text-align: right;
  409 + height: 100rpx;
  410 + width: 70%;
  411 + margin-right: 40rpx;
  412 + line-height: 100rpx;
  413 + font-size: 26rpx;
  414 + text-align: right;
412 415 }
413 416  
414 417 .zhangxi .zssj text {
415   - width: 100%;
  418 + width: 100%;
416 419 }
417 420  
418 421 .ia {
419   - display: flex;
  422 + display: flex;
420 423 }
421 424  
422 425 .zspan {
423   - text-align: center;
424   - border-bottom: 2rpx #eee solid;
425   - width: 100%;
426   - display: flex;
427   - align-items: center;
428   - justify-content: center;
429   - font-size: 28rpx;
430   - color: #777;
431   - line-height: 100rpx;
432   - height:auto;
  426 + text-align: center;
  427 + border-bottom: 2rpx #eee solid;
  428 + width: 100%;
  429 + display: flex;
  430 + align-items: center;
  431 + justify-content: center;
  432 + font-size: 28rpx;
  433 + color: #777;
  434 + line-height: 100rpx;
  435 + height: auto;
433 436  
434 437 }
435 438  
436 439 .mtop {
437   - text-align: center;
438   - color: white;
439   - background-color: #4c4c4c;
440   - width: 100%;
441   - height: 100%;
442   - position: fixed;
443   - z-index: 5;
444   - top: 0;
445   - left: 0;
  440 + text-align: center;
  441 + color: white;
  442 + background-color: #4c4c4c;
  443 + width: 100%;
  444 + height: 100%;
  445 + position: fixed;
  446 + z-index: 5;
  447 + top: 0;
  448 + left: 0;
446 449 }
447 450  
448 451 .mt1 {
449   - margin-top: 100px;
450   - margin-bottom: 20rpx;
  452 + margin-top: 100px;
  453 + margin-bottom: 20rpx;
451 454 }
452 455  
453 456 .mts {
454   - color: #e1e10b;
  457 + color: #e1e10b;
455 458 }
456 459  
457 460 .mcou {
458   - font-size: 48rpx;
  461 + font-size: 48rpx;
459 462 }
460 463  
461 464 .mfoot {
462   - width: 100%;
463   - margin-top: 700rpx;
  465 + width: 100%;
  466 + margin-top: 700rpx;
464 467 }
465 468  
466 469 .mbtn {
467   - margin-top: 60rpx;
468   - width: 400rpx;
469   - background: #666;
470   - color: #fff;
471   - border-radius: 20rpx;
472   - font-size: 32rpx;
  470 + margin-top: 60rpx;
  471 + width: 400rpx;
  472 + background: #666;
  473 + color: #fff;
  474 + border-radius: 20rpx;
  475 + font-size: 32rpx;
473 476 }
474 477  
475 478 .etop {
476   - padding-top: 200rpx;
477   - width: 100%;
478   - height: 100%;
479   - position: fixed;
480   - left: 0rpx;
481   - top: 0rpx;
482   - z-index: 12rpx;
483   - background-color: white;
  479 + padding-top: 200rpx;
  480 + width: 100%;
  481 + height: 100%;
  482 + position: fixed;
  483 + left: 0rpx;
  484 + top: 0rpx;
  485 + z-index: 12rpx;
  486 + background-color: white;
484 487 }
485 488  
486 489 .emyimage {
487   - display: flex;
488   - justify-content: center;
489   - align-items: center;
  490 + display: flex;
  491 + justify-content: center;
  492 + align-items: center;
490 493 }
491 494  
492 495 .emyimage image {
493   - background-color: red;
494   - width: 160rpx;
495   - height: 160rpx;
496   - margin: 0 auto;
  496 + background-color: red;
  497 + width: 160rpx;
  498 + height: 160rpx;
  499 + margin: 0 auto;
497 500 }
498 501  
499 502 .espan {
500   - font-size: 32rpx;
501   - margin-top: 10rpx;
  503 + font-size: 32rpx;
  504 + margin-top: 10rpx;
502 505 }
503 506  
504 507 .erweima {
505   - margin-top: 10rpx;
506   - width: 100%;
  508 + margin-top: 10rpx;
  509 + width: 100%;
507 510 }
508 511  
509 512 .erzhou {
510   - width: 200rpx;
511   - float: left;
512   - margin-right: 20rpx;
  513 + width: 200rpx;
  514 + float: left;
  515 + margin-right: 20rpx;
513 516 }
514 517  
515 518 .erzhou image {
516   - background-color: blanchedalmond;
517   - width: 200rpx;
518   - height: 200rpx;
  519 + background-color: blanchedalmond;
  520 + width: 200rpx;
  521 + height: 200rpx;
519 522 }
520 523  
521 524 .eright {
522   - width: 500rpx;
523   - float: left;
524   - font-size: 32rpx;
  525 + width: 500rpx;
  526 + float: left;
  527 + font-size: 32rpx;
525 528 }
526 529  
527 530 .body {
528   - background-color: white;
529   - height: auto;
530   - width: 100%;
531   - margin-top: 4rpx;
  531 + background-color: white;
  532 + height: auto;
  533 + width: 100%;
  534 + margin-top: 4rpx;
532 535 }
533 536  
534 537 .cenrtoptitle {
535   - float: left;
536   - width: 450rpx;
537   - font-size: 28rpx;
538   - margin-top: 20rpx;
539   -
  538 + float: left;
  539 + width: 450rpx;
  540 + font-size: 28rpx;
  541 + margin-top: 20rpx;
  542 +
540 543 }
541 544  
542 545 .cenrtop {
543   - margin-top: 20rpx;
544   - background-color: red;
545   - color: white;
546   - border-radius: 10rpx;
547   - padding:0 16rpx;
548   - font-size: 28rpx;
549   - float: left;
550   - height: 40rpx;
  546 + margin-top: 20rpx;
  547 + background-color: red;
  548 + color: white;
  549 + border-radius: 10rpx;
  550 + padding: 0 16rpx;
  551 + font-size: 28rpx;
  552 + float: left;
  553 + height: 40rpx;
551 554 }
552 555  
553 556 .yijian {
554   - position: fixed;
555   - top: 0rpx;
556   - left: 0rpx;
557   - width: 100%;
558   - height: 100%;
559   - z-index: 14rpx;
560   - background-color: rgba(0, 0, 0, 0.3);
  557 + position: fixed;
  558 + top: 0rpx;
  559 + left: 0rpx;
  560 + width: 100%;
  561 + height: 100%;
  562 + z-index: 14rpx;
  563 + background-color: rgba(0, 0, 0, 0.3);
561 564 }
562 565  
563 566 .buy-option {
564   - background: #fff;
565   - box-shadow: 0 0 6px rgba(0, 0, 0, 0.5);
566   - padding: 20rpx;
567   - min-height: 400rpx;
568   - padding-bottom: 120rpx;
569   - width: 100%;
570   - margin-top: 180rpx;
  567 + background: #fff;
  568 + box-shadow: 0 0 6px rgba(0, 0, 0, 0.5);
  569 + padding: 20rpx;
  570 + min-height: 400rpx;
  571 + padding-bottom: 120rpx;
  572 + width: 100%;
  573 + margin-top: 180rpx;
571 574 }
572 575  
573 576 .buy-top {
574   - width: 100%;
  577 + width: 100%;
575 578 }
576 579  
577 580 .buy-image {
578   - margin-right: 20rpx;
579   - width: 320rpx;
580   - height: 200rpx;
581   - float: left;
  581 + margin-right: 20rpx;
  582 + width: 320rpx;
  583 + height: 200rpx;
  584 + float: left;
582 585 }
583 586  
584 587 .buy-image image {
585   - width: 200rpx;
586   - height: 200rpx;
587   - background-color: burlywood;
588   - float: left;
  588 + width: 200rpx;
  589 + height: 200rpx;
  590 + background-color: burlywood;
  591 + float: left;
589 592 }
590 593  
591 594 .buy-image text {
592   - margin-left: 10rpx;
593   - color: red;
  595 + margin-left: 10rpx;
  596 + color: red;
594 597 }
595 598  
596 599 .buy-cou {
597   - float: right;
598   - width: 100rpx;
599   - height: 200rpx;
600   - background-color: white;
601   - font-size: 60rpx;
602   - color: black;
  600 + float: right;
  601 + width: 100rpx;
  602 + height: 200rpx;
  603 + background-color: white;
  604 + font-size: 60rpx;
  605 + color: black;
603 606 }
604 607  
605 608 .t1 {
606   - float: left;
607   - font-size: 28rpx;
608   - padding-left: 4rpx;
609   - color: red;
610   - padding-top: 10rpx;
  609 + float: left;
  610 + font-size: 28rpx;
  611 + padding-left: 4rpx;
  612 + color: red;
  613 + padding-top: 10rpx;
611 614 }
612 615  
613 616 .buy-button {
614   - width: 100%;
615   - float: left;
616   - margin-top: 22rpx;
  617 + width: 100%;
  618 + float: left;
  619 + margin-top: 22rpx;
617 620 }
618 621  
619 622 .buy-button text {
620   - float: left;
  623 + float: left;
621 624 }
622 625  
623 626 .stepper {
624   - height: 52rpx;
625   - float: left;
626   - border: 2rpx solid #ccc;
627   - border-radius: 6rpx;
628   - margin-left: 28rpx;
  627 + height: 52rpx;
  628 + float: left;
  629 + border: 2rpx solid #ccc;
  630 + border-radius: 6rpx;
  631 + margin-left: 28rpx;
629 632 }
630 633  
631 634 /*加号和减号*/
632 635  
633 636 .stepper text {
634   - float: left;
635   - width: 76rpx;
636   - line-height: 52rpx;
637   - text-align: center;
  637 + float: left;
  638 + width: 76rpx;
  639 + line-height: 52rpx;
  640 + text-align: center;
638 641 }
639 642  
640 643 /*数值*/
641 644  
642 645 .stepper input {
643   - width: 80rpx;
644   - height: 52rpx;
645   - float: left;
646   - margin: 0 auto;
647   - text-align: center;
648   - font-size: 24rpx;
649   - border-left: 2rpx solid #ccc;
650   - border-right: 2rpx solid #ccc;
  646 + width: 80rpx;
  647 + height: 52rpx;
  648 + float: left;
  649 + margin: 0 auto;
  650 + text-align: center;
  651 + font-size: 24rpx;
  652 + border-left: 2rpx solid #ccc;
  653 + border-right: 2rpx solid #ccc;
651 654 }
652 655  
653 656 /*普通样式*/
654 657  
655 658 .stepper .normal {
656   - color: black;
  659 + color: black;
657 660 }
658 661  
659 662 /*禁用样式*/
660 663  
661 664 .stepper .disable {
662   - color: #ccc;
  665 + color: #ccc;
663 666 }
664 667  
665 668 .quhuo {
666   - width: 100%;
667   - color: rgb(51, 51, 51);
668   - float: left;
669   - margin-top: 20rpx;
  669 + width: 100%;
  670 + color: rgb(51, 51, 51);
  671 + float: left;
  672 + margin-top: 20rpx;
670 673 }
671 674  
672 675 .x-z {
673   - width: 100%;
674   - float: left;
675   - color: rgb(51, 51, 51);
676   - font-size: 36rpx;
  676 + width: 100%;
  677 + float: left;
  678 + color: rgb(51, 51, 51);
  679 + font-size: 36rpx;
677 680 }
678 681  
679 682 .btn {
680   - width: 94%;
681   - background-color: red;
682   - color: white;
683   - text-align: center;
684   - height: 88rpx;
685   - line-height: 88rpx;
686   - float: left;
687   - margin: 0 auto;
  683 + width: 94%;
  684 + background-color: red;
  685 + color: white;
  686 + text-align: center;
  687 + height: 88rpx;
  688 + line-height: 88rpx;
  689 + float: left;
  690 + margin: 0 auto;
688 691 }
689 692  
690 693 .mck {
691   - min-height: 100rpx;
692   - width: 100%;
693   - border-bottom: 24rpx #eee solid;
  694 + min-height: 100rpx;
  695 + width: 100%;
  696 + border-bottom: 24rpx #eee solid;
694 697 }
695 698  
696 699 /* pages/yi/yi.wxss */
697 700  
698 701 .buy-option {
699   - background: #fff;
700   - padding: 20rpx;
701   - margin-top: 650rpx;
702   - width: 100%;
  702 + background: #fff;
  703 + padding: 20rpx;
  704 + margin-top: 650rpx;
  705 + width: 100%;
703 706 }
704 707  
705 708 .buy-top {
706   - width: 100%;
  709 + width: 100%;
707 710 }
708 711  
709 712 .buy-image {
710   - margin-right: 20rpx;
711   - width: 630rpx;
712   - height: 200rpx;
713   - float: left;
  713 + margin-right: 20rpx;
  714 + width: 630rpx;
  715 + height: 200rpx;
  716 + float: left;
714 717 }
715 718  
716 719 .buy-image image {
717   - width: 200rpx;
718   - height: 200rpx;
719   - background-color: burlywood;
720   - float: left;
721   - margin-right: 16rpx;
  720 + width: 200rpx;
  721 + height: 200rpx;
  722 + background-color: burlywood;
  723 + float: left;
  724 + margin-right: 16rpx;
722 725 }
723 726  
724 727  
725 728 .buy-image text {
726   - margin-left: 10rpx;
727   - color: red;
  729 + margin-left: 10rpx;
  730 + color: red;
728 731 }
729 732  
730 733 .buy-cou {
731   - float: right;
732   - width: 60rpx;
733   - height: 60rpx;
734   - background-color: white;
735   - font-size: 60rpx;
736   - color: black;
737   - margin-right: 40rpx;
738   - text-align: center;
739   - line-height: 60rpx;
740   - padding-bottom: 4rpx;
  734 + float: right;
  735 + width: 60rpx;
  736 + height: 60rpx;
  737 + background-color: white;
  738 + font-size: 60rpx;
  739 + color: black;
  740 + margin-right: 40rpx;
  741 + text-align: center;
  742 + line-height: 60rpx;
  743 + padding-bottom: 4rpx;
741 744 }
742 745  
743 746 .t1 {
744   - font-size: 28rpx;
745   - padding-left: 4rpx;
746   - color: red;
747   - padding-top: 10rpx;
  747 + font-size: 28rpx;
  748 + padding-left: 4rpx;
  749 + color: red;
  750 + padding-top: 10rpx;
748 751 }
749 752  
750 753 .buy-button {
751   - width: 100%;
752   - margin-top: 30rpx;
  754 + width: 100%;
  755 + margin-top: 30rpx;
753 756 }
754 757  
755 758 .buy-button text {
756   - /*float: left;*/
757   - display: inline-block;
  759 + /*float: left;*/
  760 + display: inline-block;
758 761 }
759 762  
760 763 .stepper {
761   - height: 52rpx;
762   - display: inline-block;
763   - border: 2rpx solid #ccc;
764   - border-radius: 6rpx;
765   - margin-left: 28rpx;
  764 + height: 52rpx;
  765 + display: inline-block;
  766 + border: 2rpx solid #ccc;
  767 + border-radius: 6rpx;
  768 + margin-left: 28rpx;
766 769 }
767 770  
768 771 /*加号和减号*/
769 772  
770 773 .stepper text {
771   - float: left;
772   - width: 65rpx;
773   - line-height: 52rpx;
774   - text-align: center;
  774 + float: left;
  775 + width: 65rpx;
  776 + line-height: 52rpx;
  777 + text-align: center;
775 778 }
776 779  
777 780 /*数值*/
778 781  
779 782 .stepper input {
780   - width: 84rpx;
781   - height: 52rpx;
782   - float: left;
783   - margin: 0 auto;
784   - text-align: center;
785   - font-size: 24rpx;
786   - border-left: 2rpx solid #ccc;
787   - border-right: 2rpx solid #ccc;
  783 + width: 84rpx;
  784 + height: 52rpx;
  785 + float: left;
  786 + margin: 0 auto;
  787 + text-align: center;
  788 + font-size: 24rpx;
  789 + border-left: 2rpx solid #ccc;
  790 + border-right: 2rpx solid #ccc;
788 791 }
789 792  
790 793 /*普通样式*/
791 794  
792 795 .stepper .normal {
793   - color: black;
  796 + color: black;
794 797 }
795 798  
796 799 /*禁用样式*/
797 800  
798 801 .stepper .disable {
799   - color: #ccc;
  802 + color: #ccc;
800 803 }
801 804  
802 805 .quhuo {
803   - width: 100%;
804   - color: rgb(51, 51, 51);
805   - margin-top: 45rpx;
806   - font-size: 32rpx
  806 + width: 100%;
  807 + color: rgb(51, 51, 51);
  808 + margin-top: 45rpx;
  809 + font-size: 32rpx
807 810 }
808 811  
809 812 .quhuo image {
810   - width: 40rpx;
811   - height: 40rpx;
812   - display: inline-block;
813   - position: relative;
814   - left: 500rpx;
  813 + width: 40rpx;
  814 + height: 40rpx;
  815 + display: inline-block;
  816 + position: relative;
  817 + left: 500rpx;
815 818 }
816 819  
817 820 .ttxz {
818   - display: inline-block;
  821 + display: inline-block;
819 822 }
820 823  
821 824 .xuanze {
822   - width: 100%;
823   - height: 80rpx;
824   - display: inline-block;
825   - border-bottom: 1rpx #e7e7e7 solid;
826   - font-size: 32rpx;
827   - line-height: 80rpx;
  825 + width: 100%;
  826 + height: 80rpx;
  827 + display: inline-block;
  828 + border-bottom: 1rpx #e7e7e7 solid;
  829 + font-size: 32rpx;
  830 + line-height: 80rpx;
828 831 }
829 832  
830 833 .xuanze1 {
831   - width: 100%;
832   - color: rgb(51, 51, 51);
833   - height: 80rpx;
834   - display: inline-block;
835   - border-bottom: 1rpx #e7e7e7 solid;
836   - line-height: 80rpx;
837   - overflow: hidden;
  834 + width: 100%;
  835 + color: rgb(51, 51, 51);
  836 + height: 80rpx;
  837 + display: inline-block;
  838 + border-bottom: 1rpx #e7e7e7 solid;
  839 + line-height: 80rpx;
  840 + overflow: hidden;
838 841 }
839 842  
840 843 .x-z {
841   - width: 100%;
842   - color: rgb(51, 51, 51);
843   - font-size: 36rpx;
844   - height: auto;
  844 + width: 100%;
  845 + color: rgb(51, 51, 51);
  846 + font-size: 36rpx;
  847 + height: auto;
845 848 }
846 849  
847 850 .btn {
848   - width: 100%;
849   - background-color: red;
850   - color: white;
851   - text-align: center;
852   - height: 88rpx;
853   - line-height: 88rpx;
  851 + width: 100%;
  852 + background-color: red;
  853 + color: white;
  854 + text-align: center;
  855 + height: 88rpx;
  856 + line-height: 88rpx;
854 857 }
855 858  
856 859 .clear {
857   - clear: both;
  860 + clear: both;
858 861 }
859 862  
860 863 .fir_view {
861   - max-height: 300rpx;
862   - overflow-y: scroll;
  864 + max-height: 300rpx;
  865 + overflow-y: scroll;
863 866 }
864 867  
865 868 .pop_up {
866   - min-height: 200rpx;
867   - position: fixed;
868   - bottom: 0;
869   - left: 0;
870   - width: 100%;
871   - background-color: rgba(0, 0, 0, 0.3); font-size: 34rpx;
872   - color:rgb(51, 51, 51);
  869 + min-height: 200rpx;
  870 + position: fixed;
  871 + bottom: 0;
  872 + left: 0;
  873 + width: 100%;
  874 + background-color: rgba(0, 0, 0, 0.3);
  875 + font-size: 34rpx;
  876 + color: rgb(51, 51, 51);
873 877  
874 878 }
875 879  
876 880 .end_name {
877   - display: inline-block;
  881 + display: inline-block;
878 882 }
879 883  
880 884 /*mask*/
881 885  
882 886 .toast_mask {
883   - opacity: 0;
884   - width: 100%;
885   - height: 100%;
886   - overflow: hidden;
887   - position: fixed;
888   - top: 0rpx;
889   - left: 0rpx;
890   - z-index: 888;
  887 + opacity: 0;
  888 + width: 100%;
  889 + height: 100%;
  890 + overflow: hidden;
  891 + position: fixed;
  892 + top: 0rpx;
  893 + left: 0rpx;
  894 + z-index: 888;
891 895 }
892 896  
893 897 /*toast*/
894 898  
895 899 .toast_content_box {
896   - display: flex;
897   - width: 100%;
898   - height: 100%;
899   - justify-content: center;
900   - align-items: center;
901   - position: fixed;
902   - z-index: 999;
903   - top: 0rpx;
  900 + display: flex;
  901 + width: 100%;
  902 + height: 100%;
  903 + justify-content: center;
  904 + align-items: center;
  905 + position: fixed;
  906 + z-index: 999;
  907 + top: 0rpx;
904 908 }
905 909  
906 910 .toast_content {
907   - width: 50%;
908   - padding: 20rpx;
909   - background: rgba(0, 0, 0, 0.5);
910   - border-radius: 20rpx;
  911 + width: 50%;
  912 + padding: 20rpx;
  913 + background: rgba(0, 0, 0, 0.5);
  914 + border-radius: 20rpx;
911 915 }
912 916  
913 917 .toast_content_text {
914   - height: 100%;
915   - width: 100%;
916   - color: #fff;
917   - font-size: 28rpx;
918   - text-align: center;
  918 + height: 100%;
  919 + width: 100%;
  920 + color: #fff;
  921 + font-size: 28rpx;
  922 + text-align: center;
919 923 }
920 924  
921 925 .jt {
922   - width: 30rpx;
923   - height: 30rpx;
924   - display: inline-block;
  926 + width: 30rpx;
  927 + height: 30rpx;
  928 + display: inline-block;
925 929 }
926 930  
927   -.jiajian { color: #999;}
  931 +.jiajian {
  932 + color: #999;
  933 +}
928 934  
929 935 .t_wz {
930   - line-height: 110rpx;
931   - height: 110rpx;
932   - font-size: 36rpx;
  936 + line-height: 110rpx;
  937 + height: 110rpx;
  938 + font-size: 36rpx;
933 939 }
934 940  
935 941 .down-arrow {
936   - display: inline-block;
937   - position: relative;
938   - width: 40rpx;
939   - height: 30rpx;
940   - margin-right: 20rpx;
  942 + display: inline-block;
  943 + position: relative;
  944 + width: 40rpx;
  945 + height: 30rpx;
  946 + margin-right: 20rpx;
941 947 }
942 948  
943 949 .down-arrow::after {
944   - display: inline-block;
945   - content: " ";
946   - height: 18rpx;
947   - width: 18rpx;
948   - border-width: 0 2rpx 2rpx 0;
949   - border-color: #999;
950   - border-style: solid;
951   - transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
952   - transform-origin: center;
953   - transition: transform 0.3s;
954   - position: absolute;
955   - top: 50%;
956   - right: 10rpx;
957   - margin-top: -10rpx;
  950 + display: inline-block;
  951 + content: " ";
  952 + height: 18rpx;
  953 + width: 18rpx;
  954 + border-width: 0 2rpx 2rpx 0;
  955 + border-color: #999;
  956 + border-style: solid;
  957 + transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
  958 + transform-origin: center;
  959 + transition: transform 0.3s;
  960 + position: absolute;
  961 + top: 50%;
  962 + right: 10rpx;
  963 + margin-top: -10rpx;
958 964 }
959 965  
960 966 .down-arrow1 {
961   - display: inline-block;
962   - position: relative;
963   - width: 40rpx;
964   - height: 30rpx;
965   - margin-right: 20rpx;
966   - margin-top: 12rpx;
  967 + display: inline-block;
  968 + position: relative;
  969 + width: 40rpx;
  970 + height: 30rpx;
  971 + margin-right: 20rpx;
  972 + margin-top: 12rpx;
967 973 }
968 974  
969 975 .down-arrow1::after {
970   - display: inline-block;
971   - content: " ";
972   - height: 18rpx;
973   - width: 18rpx;
974   - border-width: 0 2rpx 2rpx 0;
975   - border-color: #999;
976   - border-style: solid;
977   - transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
978   - transform-origin: center;
979   - transition: transform 0.3s;
980   - position: absolute;
981   - top: 50%;
982   - right: 10rpx;
983   - margin-top: -10rpx;
  976 + display: inline-block;
  977 + content: " ";
  978 + height: 18rpx;
  979 + width: 18rpx;
  980 + border-width: 0 2rpx 2rpx 0;
  981 + border-color: #999;
  982 + border-style: solid;
  983 + transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
  984 + transform-origin: center;
  985 + transition: transform 0.3s;
  986 + position: absolute;
  987 + top: 50%;
  988 + right: 10rpx;
  989 + margin-top: -10rpx;
984 990 }
985 991  
986 992 .down-arrow1::after {
987   - transform-origin: center;
988   - transform: rotate(-135deg);
989   - transition: transform 0.3s;
  993 + transform-origin: center;
  994 + transform: rotate(-135deg);
  995 + transition: transform 0.3s;
990 996 }
991 997  
992 998 .goodslisttop::after {
993   - content: "";
994   - width: 100%;
995   - height: 1px;
996   - border-bottom: 1px #d4d4d4 solid;
997   - display: block;
998   - margin-top: -12px;
  999 + content: "";
  1000 + width: 100%;
  1001 + height: 1px;
  1002 + border-bottom: 1px #d4d4d4 solid;
  1003 + display: block;
  1004 + margin-top: -12px;
999 1005 }
1000 1006  
1001 1007 .ia {
1002   - display: flex;
1003   - width: 100%;
  1008 + display: flex;
  1009 + width: 100%;
1004 1010 }
1005 1011  
1006 1012 .bview {
1007   - position: fixed;
1008   - top: 0;
1009   - left: 0;
1010   - width: 100%;
1011   - height: 100%;
1012   - background-color: rgba(0, 0, 0, 0.5);
  1013 + position: fixed;
  1014 + top: 0;
  1015 + left: 0;
  1016 + width: 100%;
  1017 + height: 100%;
  1018 + background-color: rgba(0, 0, 0, 0.5);
1013 1019 }
1014 1020  
1015 1021 .juzhong {
1016   - position: fixed;
1017   - top: 0;
1018   - left: 0;
1019   - width: 100%;
1020   - height: 100%;
1021   - display: flex;
1022   - flex-direction: row;
1023   - justify-content: center;
1024   - align-items: center;
  1022 + position: fixed;
  1023 + top: 0;
  1024 + left: 0;
  1025 + width: 100%;
  1026 + height: 100%;
  1027 + display: flex;
  1028 + flex-direction: row;
  1029 + justify-content: center;
  1030 + align-items: center;
1025 1031 }
1026 1032  
1027 1033 .juzhong .xq {
1028   - padding: 0 20rpx;
1029   - background: #fff;
1030   - font-size: 30rpx;
1031   - padding-bottom: 20rpx;
  1034 + padding: 0 20rpx;
  1035 + background: #fff;
  1036 + font-size: 30rpx;
  1037 + padding-bottom: 20rpx;
1032 1038 }
1033 1039  
1034 1040 .juzhong .xq .title {
1035   - text-align: center;
1036   - margin: 20rpx 0;
1037   - position: relative;
1038   - height: 50rpx;
  1041 + text-align: center;
  1042 + margin: 20rpx 0;
  1043 + position: relative;
  1044 + height: 50rpx;
1039 1045 }
1040 1046  
1041 1047 .juzhong .xq .hs1 {
1042   - font-size: 28rpx;
1043   - color: #ab8f9e;
  1048 + font-size: 28rpx;
  1049 + color: #ab8f9e;
1044 1050 }
1045 1051  
1046 1052 .juzhong .xq .title .close {
1047   - position: absolute;
1048   - top: 0;
1049   - right: 0;
1050   - width: 45rpx;
1051   - height: 45rpx;
  1053 + position: absolute;
  1054 + top: 0;
  1055 + right: 0;
  1056 + width: 45rpx;
  1057 + height: 45rpx;
1052 1058 }
1053 1059  
1054 1060 .pt_qd {
1055   - margin-top: 40rpx;
1056   - height: auto;
  1061 + margin-top: 40rpx;
  1062 + height: auto;
1057 1063 }
1058 1064  
1059 1065 .spec-cart-btn.w100 {
1060   - width: 100%;
1061   - margin-left: 0;
1062   - height: 80rpx;
1063   - line-height: 80rpx;
  1066 + width: 100%;
  1067 + margin-left: 0;
  1068 + height: 80rpx;
  1069 + line-height: 80rpx;
1064 1070 }
1065 1071  
1066 1072  
1067 1073 .bview {
1068   - position: fixed;
1069   - top: 0;
1070   - left: 0;
1071   - width: 100%;
1072   - height: 100%;
1073   - background-color: rgba(0, 0, 0, 0.5);
  1074 + position: fixed;
  1075 + top: 0;
  1076 + left: 0;
  1077 + width: 100%;
  1078 + height: 100%;
  1079 + background-color: rgba(0, 0, 0, 0.5);
1074 1080 }
1075 1081  
1076 1082 .juzhong {
1077   - position: fixed;
1078   - top: 0;
1079   - left: 0;
1080   - width: 100%;
1081   - height: 100%;
1082   - display: flex;
1083   - flex-direction: row;
1084   - justify-content: center;
1085   - align-items: center;
  1083 + position: fixed;
  1084 + top: 0;
  1085 + left: 0;
  1086 + width: 100%;
  1087 + height: 100%;
  1088 + display: flex;
  1089 + flex-direction: row;
  1090 + justify-content: center;
  1091 + align-items: center;
1086 1092 }
1087 1093  
1088 1094 .juzhong .xq {
1089   - padding: 0 20rpx;
1090   - background: #fff;
1091   - font-size: 30rpx;
1092   - padding-bottom: 20rpx;
  1095 + padding: 0 20rpx;
  1096 + background: #fff;
  1097 + font-size: 30rpx;
  1098 + padding-bottom: 20rpx;
1093 1099 }
1094 1100  
1095 1101 .juzhong .xq .title {
1096   - text-align: center;
1097   - margin: 20rpx 0;
1098   - position: relative;
1099   - height: 50rpx;
  1102 + text-align: center;
  1103 + margin: 20rpx 0;
  1104 + position: relative;
  1105 + height: 50rpx;
1100 1106 }
1101 1107  
1102 1108 .juzhong .xq .hs1 {
1103   - font-size: 28rpx;
1104   - color: #ab8f9e;
  1109 + font-size: 28rpx;
  1110 + color: #ab8f9e;
1105 1111 }
1106 1112  
1107 1113 .juzhong .xq .title .close {
1108   - position: absolute;
1109   - top: 0;
1110   - right: 0;
1111   - width: 45rpx;
1112   - height: 45rpx;
  1114 + position: absolute;
  1115 + top: 0;
  1116 + right: 0;
  1117 + width: 45rpx;
  1118 + height: 45rpx;
1113 1119 }
1114 1120  
1115 1121 .pt_qd {
1116   - margin-top: 40rpx;
1117   - height: auto;
  1122 + margin-top: 40rpx;
  1123 + height: auto;
1118 1124 }
1119 1125  
1120 1126 .spec-cart-btn.w100 {
1121   - width: 100%;
1122   - margin-left: 0;
1123   - height: 80rpx;
1124   - line-height: 80rpx;
  1127 + width: 100%;
  1128 + margin-left: 0;
  1129 + height: 80rpx;
  1130 + line-height: 80rpx;
  1131 +}
  1132 +
  1133 +.show_zf_dd {
  1134 + display: flex;
  1135 + padding: 15rpx 40rpx;
  1136 + justify-content: space-between;
  1137 + font-size: 30rpx;
  1138 + color: #666;
  1139 +}
  1140 +
  1141 +.flex_tou {
  1142 + display: flex;
  1143 + justify-content: center;
  1144 + width: 100%;
  1145 + height: 175rpx;
  1146 + align-items: center;
  1147 +}
  1148 +
  1149 +.xc-goods-details {
  1150 + width: 479rpx;
  1151 + margin-top: 20rpx;
  1152 + height: 80rpx;
  1153 + align-items: center;
  1154 +
  1155 +}
  1156 +
  1157 +.xc-valframe {
  1158 + border-radius: 7rpx;
  1159 + border: 1rpx solid;
  1160 + margin-top: 3rpx;
  1161 +}
  1162 +
  1163 +.xc-valframe .xc-frame-img {
  1164 + width: 30rpx;
  1165 + height: 100%;
  1166 + background: #e22b44;
  1167 +}
  1168 +
  1169 +.xc-valframe .xc-frame-img .picture {
  1170 + width: 25rpx;
  1171 + height: 25rpx;
  1172 + margin-top: 4rpx;
  1173 +
  1174 +}
  1175 +
  1176 +.bodybutton .xc-good-friend {
  1177 + background: #fab55a;
  1178 + border-radius: 15rpx;
  1179 +}
  1180 +
  1181 +.bodybutton .xc-home-page {
  1182 + margin-top: 20rpx;
  1183 + background-color: #e22b44;
  1184 + border-radius: 15rpx;
  1185 +}
  1186 +
  1187 +.xc-ellipsis-img {
  1188 + width: 56rpx;
  1189 + height: 56rpx;
  1190 + padding-top: 15rpx;
  1191 +}
  1192 +
  1193 +.xc-ptcomplete {
  1194 + width: 74%;
  1195 + height: 105rpx;
  1196 + line-height: 105rpx;
  1197 + float: right;
  1198 +
  1199 +}
  1200 +
  1201 +.xc-ptcomplete .xc-img-frame .img {
  1202 + width: 105rpx;
  1203 + height: 105rpx;
  1204 + float: right;
  1205 +}
  1206 +
  1207 +.xc-ptcomplete .xc-img-frame {
  1208 + width: 205rpx;
  1209 + height: 105rpx;
  1210 + margin-top: 20rpx;
  1211 +}
  1212 +
  1213 +.xc-ptcomplete .xc-end {
  1214 + width: 283rpx;
  1215 + text-align: right;
  1216 +}
  1217 +
  1218 +.iw {
  1219 + padding-right: 33rpx;
  1220 +}
  1221 +
  1222 +.xc-ptcomplete .xc-img-frames {
  1223 + width: 345rpx;
  1224 + height: 105rpx;
  1225 + margin-top: 20rpx;
  1226 +
  1227 +}
  1228 +
  1229 +.xc-ptcomplete .xc-img-frames .img {
  1230 + width: 105rpx;
  1231 + height: 105rpx;
  1232 + float: right;
  1233 +}
  1234 +
  1235 +.bodybutton .xc-good-friend.co-w {
  1236 + background-color: #aeaeae
  1237 +}
  1238 +
  1239 +
  1240 +
  1241 +
  1242 +
  1243 +
  1244 +
  1245 +
  1246 +
  1247 +
  1248 +
  1249 +
  1250 +
  1251 +
  1252 +
  1253 +.spec-model {
  1254 + position: fixed;
  1255 + bottom: 0;
  1256 + z-index: 20;
  1257 + background: white;
  1258 + width: 100%;
  1259 + /* padding: 0 30rpx; */
  1260 + font-size: 32rpx;
  1261 + box-sizing: border-box;
  1262 + border-radius: 20rpx;
  1263 + height: 72%;
  1264 +}
  1265 +
  1266 +.spec-model .pding {
  1267 + padding: 0 30rpx;
  1268 +}
  1269 +
  1270 +.spec-goods {
  1271 + padding: 30rpx 0 20rpx;
  1272 + float: left;
  1273 + width: 100%;
  1274 + border-bottom: 2rpx solid #eee;
  1275 +}
  1276 +
  1277 +.spec-img {
  1278 + float: left;
  1279 + height: 186rpx;
  1280 + width: 186rpx;
  1281 + border: 4rpx solid #eee
  1282 +}
  1283 +
  1284 +.spec-goods-info {
  1285 + float: left;
  1286 + padding: 0 25rpx;
  1287 + width: 400rpx;
  1288 +}
  1289 +
  1290 +.spec-goods-name {
  1291 + font-size: 30rpx;
  1292 + line-height: 35rpx;
  1293 + height: 70rpx;
  1294 + margin: 15rpx 20rpx 25rpx 0;
  1295 + overflow: hidden;
  1296 + text-overflow: ellipsis;
  1297 + color: #333;
  1298 +}
  1299 +
  1300 +.spec-goods-price {
  1301 + color: #d60021;
  1302 + font-size: 33rpx;
  1303 + font-weight: bold;
  1304 +}
  1305 +
  1306 +.spec-goods-stock {
  1307 + margin-top: 3rpx;
  1308 + font-size: 24rpx;
  1309 + color: #999999;
  1310 + margin-right: 15rpx;
  1311 +}
  1312 +
  1313 +.spec-name {
  1314 + clear: both;
  1315 + padding: 20rpx 0;
  1316 + font-size: 30rpx;
  1317 + color: #333;
  1318 +}
  1319 +
  1320 +.quhuo {
  1321 + font-size: 30rpx;
  1322 + color: #000
  1323 +}
  1324 +
  1325 +.b_num {
  1326 + display: flex;
  1327 + font-size: 30rpx;
  1328 + color: #333;
  1329 +}
  1330 +
  1331 +.count {
  1332 + position: fixed;
  1333 + display: flex;
  1334 + height: 50rpx;
  1335 + border: 1rpx solid #000;
  1336 + font-size: 28rpx;
  1337 + right: 30rpx;
  1338 +}
  1339 +
  1340 +
  1341 +.count>view,
  1342 +.count>input {
  1343 + width: 60rpx;
  1344 + height: 50rpx;
  1345 + line-height: 50rpx;
  1346 + text-align: center;
  1347 +}
  1348 +
  1349 +.spec_bt {
  1350 + background: fff;
  1351 + color: #333;
  1352 + margin-left: 10rpx;
  1353 + padding: 4rpx 15rpx 4rpx;
  1354 + display: inline-block;
  1355 + border-radius: 30rpx;
  1356 + font-size: 24rpx;
  1357 + border: 1rpx solid #ccc;
  1358 + margin: 10rpx;
  1359 + height: 40rpx;
  1360 + line-height: 40rpx;
  1361 +}
  1362 +
  1363 +.spec_bt.act {
  1364 + background: #d60021;
  1365 + color: #fff;
  1366 + border: 1rpx solid #d60021;
  1367 +}
  1368 +
  1369 +.sub {
  1370 + border-right: 1px solid #000;
  1371 +}
  1372 +
  1373 +.add {
  1374 + border-left: 1px solid #000;
  1375 +}
  1376 +
  1377 +.spec-btn {
  1378 + color: black;
  1379 + background-color: white;
  1380 + padding: 10rpx 10rpx;
  1381 + font-size: 26rpx;
  1382 + line-height: 28rpx;
  1383 + float: left;
  1384 + border: 1rpx solid #dedede;
  1385 + margin: 4rpx 10rpx 4rpx 0;
  1386 + border-radius: 4rpx;
  1387 +}
  1388 +
  1389 +.spec-btn-click {
  1390 + color: white;
  1391 + background-color: #f23030;
  1392 + border: 1rpx solid #f23030;
  1393 +}
  1394 +
  1395 +.spec-cart-btns {
  1396 + width: 92%;
  1397 + line-height: 70rpx;
  1398 + margin: 0rpx auto;
  1399 + margin-top: 160rpx;
  1400 + border-radius: 20rpx;
  1401 + position: fixed;
  1402 + bottom: 50rpx;
  1403 + left: 4%;
  1404 +
  1405 +}
  1406 +
  1407 +.spec-cart-btn {
  1408 +
  1409 + width: 100%;
  1410 + font-size: 30rpx;
  1411 + text-align: center;
  1412 + color: white;
  1413 + border-radius: 40rpx;
  1414 +}
  1415 +
  1416 +.spec-add-cart {
  1417 + background-color: #ffb03f;
  1418 +}
  1419 +
  1420 +.spec-buy {
  1421 + background-color: #f23030;
  1422 + /* margin-left: 34rpx; */
  1423 +}
  1424 +
  1425 +.spec-cart-disable {
  1426 + background: #bbbbbb;
  1427 +}
  1428 +
  1429 +.spec-cart-btn-lg {
  1430 + width: 614rpx;
  1431 +}
  1432 +
  1433 +.prom-model {
  1434 + position: fixed;
  1435 + bottom: 0;
  1436 + z-index: 20;
  1437 + background: white;
  1438 + width: 100%;
  1439 + padding: 0 30rpx 30rpx;
  1440 + font-size: 32rpx;
  1441 + box-sizing: border-box;
  1442 + overflow-x: hidden;
  1443 +}
  1444 +
  1445 +.prom-model .prom-title {
  1446 + text-align: center;
  1447 + margin: 30rpx 0;
  1448 +}
  1449 +
  1450 +.prom-model .logistics-item {
  1451 + border: 0;
  1452 +}
  1453 +
  1454 +.prom-model .item-mes {
  1455 + width: 500rpx;
  1456 +}
  1457 +
  1458 +.integral-btn {
  1459 + width: 100%;
  1460 + padding: 0rpx;
  1461 + margin: 0rpx;
  1462 +}
  1463 +
  1464 +.clear {
  1465 + clear: both;
  1466 +}
  1467 +
  1468 +.sto_v .title,
  1469 +.sto_v .stitle {
  1470 + border-top: 1rpx solid #dedede;
  1471 + border-bottom: 1rpx solid #dedede;
  1472 + height: 78rpx;
  1473 + line-height: 78rpx;
  1474 +}
  1475 +
  1476 +.sto_v .title .tubiao,
  1477 +.sto_v .stitle .tubiao {
  1478 + width: 32rpx;
  1479 + height: 32rpx;
  1480 + margin-top: 23rpx;
  1481 +}
  1482 +
  1483 +.itemlists .item {
  1484 + border-bottom: 1rpx solid #dedede;
  1485 + height: 72rpx;
  1486 + line-height: 72rpx;
  1487 + font-size: 28rpx;
  1488 + margin: 0 10rpx;
  1489 +}
  1490 +
  1491 +.cshu {
  1492 + margin-bottom: 30rpx;
  1493 + margin-top: 20rpx;
  1494 +}
  1495 +
  1496 +.cshu view {
  1497 + color: #999;
  1498 + font-size: 30rpx;
  1499 + margin-left: 26rpx;
  1500 +}
  1501 +
  1502 +
  1503 +/*---活动特殊显示---*/
  1504 +.prom_show {
  1505 + height: 120rpx;
  1506 + display: flex;
  1507 +}
  1508 +
  1509 +.prom_show .secondkill-img {
  1510 + width: 100%;
  1511 + height: 100%;
  1512 +}
  1513 +
  1514 +.prom_show .spike-img {
  1515 + width: 283rpx;
  1516 + height: 57rpx;
  1517 + top: 35rpx;
  1518 + left: 31rpx;
  1519 +}
  1520 +
  1521 +.prom_show .stop {
  1522 + color: #d81731;
  1523 + top: 17rpx;
  1524 + right: 65rpx;
  1525 + font-weight: 600;
  1526 +}
  1527 +
  1528 +.prom_show .start {
  1529 + color: #009ae2;
  1530 + top: 17rpx;
  1531 + right: 65rpx;
  1532 + font-weight: 600;
  1533 +}
  1534 +
  1535 +.prom_show .timeac {
  1536 + font-size: 32rpx;
  1537 + height: 120rpx;
  1538 + color: #333;
  1539 +}
  1540 +
  1541 +.prom_show .timeac.left {
  1542 + width: 66%;
  1543 + color: #fff;
  1544 + background: #f23030;
  1545 +}
  1546 +
  1547 +.prom_show .timeac.right {
  1548 + width: 34%;
  1549 + background-color: #d7d7d7;
  1550 + text-align: center
  1551 +}
  1552 +
  1553 +.prom_show .secview .day {
  1554 + padding-right: 10rpx;
  1555 +}
  1556 +
  1557 +.prom_show .secview .time-val {
  1558 + width: 36rpx;
  1559 + height: 36rpx;
  1560 + border-radius: 7rpx;
  1561 + line-height: 36rpx;
  1562 +}
  1563 +
  1564 +.prom_show .secview .time {
  1565 + margin-right: 10rpx;
  1566 + margin-left: 10rpx;
  1567 +}
  1568 +
  1569 +
  1570 +.prom_show .timeac.left view {
  1571 + margin-left: 20rpx
  1572 +}
  1573 +
  1574 +.prom_show .timeac.left view.firview {
  1575 + margin-top: 10rpx
  1576 +}
  1577 +
  1578 +.prom_show .timeac.left view .tr_line {
  1579 + text-decoration: line-through;
  1580 + font-size: 28rpx;
  1581 +}
  1582 +
  1583 +.prom_show .timeac.left view .bprice {
  1584 + font-size: 50rpx;
  1585 +}
  1586 +
  1587 +.prom_show .timeac.right view.firview {
  1588 + margin-top: 12rpx;
  1589 + margin-bottom: 10rpx
  1590 +}
  1591 +
  1592 +.prom_show .timeac.right view.secview {
  1593 + display: flex;
  1594 + text-align: center;
  1595 + justify-content: center;
  1596 + flex-direction: row;
  1597 +}
  1598 +
  1599 +.prom_show .timeac.right view .tui-conutdown-box {
  1600 + /* background: #6b6b6b; */
  1601 + width: auto;
  1602 + /* min-width: 45rpx; */
  1603 + height: 45rpx;
  1604 + color: #c4182e;
  1605 + font-size: 27rpx;
  1606 + text-align: center;
  1607 + line-height: 46rpx;
  1608 +}
  1609 +
  1610 +.huise {
  1611 + background: gray
1125 1612 }
1126 1613  
1127   -.show_zf_dd{display: flex;padding: 15rpx 40rpx; justify-content: space-between; font-size: 30rpx;color: #666;}
  1614 +.lanse {
  1615 + background: #0199e2
  1616 +}
1128 1617  
1129   -.flex_tou{ display: flex; justify-content: center; width: 100%;height:175rpx;
1130   -align-items:center;}
1131   -.xc-goods-details{
1132   -width:479rpx;
1133   -margin-top:20rpx;
1134   -height:80rpx;
1135   -align-items:center;
1136 1618  
  1619 +/*------拼单------*/
  1620 +.pt_view {
  1621 + text-align: center;
  1622 + width: 100%;
  1623 + height: 100rpx;
  1624 + line-height: 100rpx;
  1625 + font-size: 26rpx
1137 1626 }
1138   -.xc-valframe{
1139   - border-radius:7rpx;
1140   -border:1rpx solid;
1141   -margin-top:3rpx;
  1627 +
  1628 +.pt_view .secondkill-img {
  1629 + width: 100%;
  1630 + height: 100%;
1142 1631 }
1143   -.xc-valframe .xc-frame-img{
1144   - width:30rpx;
1145   -height:100%;
1146   -background:#e22b44;
  1632 +
  1633 +.pt_fir {
  1634 + background: #fff;
  1635 + margin-bottom: 10rpx;
1147 1636 }
1148   -.xc-valframe .xc-frame-img .picture{
1149   - width:25rpx;
1150   -height:25rpx;
1151   -margin-top:4rpx;
1152 1637  
  1638 +.pt_fir .pt_fir_title {
  1639 + display: flex;
  1640 + align-items: center;
  1641 + margin-left: 10rpx;
  1642 + margin-top: 20rpx;
  1643 + font-size: 28rpx;
  1644 + position: relative;
1153 1645 }
1154   -.bodybutton .xc-good-friend{
1155   -background:#fab55a;border-radius:15rpx;
  1646 +
  1647 +.pt_fir .pt_fir_title .kt_type {
  1648 + color: #fff;
  1649 + background: #e9030d;
  1650 + width: 100rpx;
  1651 + line-height: 40rpx;
  1652 + border-radius: 6rpx;
  1653 + margin: 0 10rpx;
  1654 + height: 40rpx;
  1655 + font-size: 24rpx;
  1656 + text-align: center;
1156 1657 }
1157   -.bodybutton .xc-home-page{
1158   -margin-top:20rpx;background-color: #e22b44;border-radius:15rpx;
  1658 +
  1659 +.pt_fir .pt_fir_title .price {
  1660 + color: #e9030d;
  1661 + font-size: 26rpx;
1159 1662 }
1160   -.xc-ellipsis-img{
1161   -width:56rpx;
1162   -height:56rpx;
1163   -padding-top:15rpx;
  1663 +
  1664 +.pt_fir .pt_fir_title .bigw {
  1665 + font-size: 36rpx;
1164 1666 }
1165   -.xc-ptcomplete{
1166   - width:74%;
1167   -height:105rpx;
1168   -line-height:105rpx;
1169   -float:right;
1170 1667  
  1668 +.pt_fir .pt_fir_title .tprice {
  1669 + text-decoration: line-through;
  1670 + color: #949494
1171 1671 }
1172   -.xc-ptcomplete .xc-img-frame .img{
1173   - width: 105rpx;
1174   - height: 105rpx;
1175   - float: right;
  1672 +
  1673 +.pt_fir .pt_fir_title .tprice.ml50 {
  1674 + margin-left: 50rpx
1176 1675 }
1177   -.xc-ptcomplete .xc-img-frame{
1178   - width:205rpx;
1179   - height: 105rpx;
1180   - margin-top:20rpx;
  1676 +
  1677 +.pt_fir .pt_fir_title .js {
  1678 + padding: 0 15rpx;
  1679 + height: 40rpx;
  1680 + background: #e9030d;
  1681 + text-align: center;
  1682 + border-radius: 8rpx;
  1683 + color: #fff;
  1684 + margin-left: 10rpx;
1181 1685 }
1182   -.xc-ptcomplete .xc-end{
1183   - width:283rpx;
1184   -text-align:right;
  1686 +
  1687 +.pt_fir .pt_fir_title .tuannum {
  1688 + color: #e9030d;
  1689 + position: absolute;
  1690 + right: 20rpx;
  1691 + font-size: 26rpx;
1185 1692 }
1186   -.iw{
1187   -padding-right:33rpx;
  1693 +
  1694 +.pding {
  1695 + padding-top: 20rpx;
  1696 + padding-left: 20rpx;
  1697 + height: 81%;
  1698 + padding-right: 20rpx;
  1699 + font-size: 26rpx;
  1700 + color: #ea120f
1188 1701 }
1189   -.xc-ptcomplete .xc-img-frames{
1190   - width:345rpx;
1191   -height:105rpx;
1192   -margin-top:20rpx;
1193 1702  
  1703 +.pdres {
  1704 + margin-left: 10rpx;
  1705 + color: #8f8f94
1194 1706 }
1195   -.xc-ptcomplete .xc-img-frames .img{
1196   - width: 105rpx;
1197   - height: 105rpx;
1198   - float: right;
  1707 +
  1708 +.ptgz {
  1709 + position: relative;
  1710 + font-size: 30rpx;
  1711 + padding-left: 20rpx;
  1712 + margin-top: 10rpx;
  1713 + overflow: hidden
1199 1714 }
1200 1715  
1201   -.bodybutton .xc-good-friend.co-w{
1202   - background-color:#aeaeae
1203   -}
1204 1716 \ No newline at end of file
  1717 +.shuxian {
  1718 + width: 6rpx;
  1719 + height: 28rpx;
  1720 + background: #ea120f;
  1721 + display: inline-block;
  1722 + top: 5rpx;
  1723 + position: relative;
  1724 + margin-right: 5rpx
  1725 +}
  1726 +
  1727 +.ptgz_an {
  1728 + position: absolute;
  1729 + top: 5rpx;
  1730 + right: 6rpx
  1731 +}
  1732 +
  1733 +.ptgz_an .arrow-two {
  1734 + width: 18rpx;
  1735 + height: 18rpx;
  1736 + border-color: #da0b31;
  1737 + margin-top: 30rpx;
  1738 +}
  1739 +
  1740 +.pt_fir.se {
  1741 + height: auto;
  1742 + margin-bottom: 10rpx
  1743 +}
  1744 +
  1745 +.t_gz {
  1746 + padding: 10rpx 20rpx;
  1747 + font-size: 28rpx
  1748 +}
  1749 +
  1750 +.pt_fir.se1 {
  1751 + height: auto;
  1752 + margin: 0
  1753 +}
  1754 +
  1755 +.pt_fir.se2 {
  1756 + height: auto;
  1757 + margin: 0;
  1758 + border-top: 6rpx solid #eeeeee;
  1759 + border-bottom: 2rpx solid #eeeeee;
  1760 +}
  1761 +
  1762 +.pt_hb {
  1763 + height: 78rpx;
  1764 + line-height: 75rpx;
  1765 + position: relative;
  1766 + font-size: 32rpx;
  1767 + overflow: hidden;
  1768 + width: 695rpx;
  1769 + margin-left: 28rpx;
  1770 + border-bottom: 1rpx solid #E5E5E5
  1771 +}
  1772 +
  1773 +.ptgz_an.xq {
  1774 + font-size: 32rpx;
  1775 + color: #d40024
  1776 +}
  1777 +
  1778 +.wf {
  1779 + display: flex;
  1780 + padding: 20rpx 0;
  1781 +}
  1782 +
  1783 +.wf .item {
  1784 + width: 24.5%;
  1785 + text-align: center;
  1786 + font-size: 26rpx;
  1787 + color: #666
  1788 +}
  1789 +
  1790 +.wf .item .item_txy {
  1791 + position: relative;
  1792 + width: 60rpx;
  1793 + height: 60rpx;
  1794 + background: #ea120f;
  1795 + border-radius: 50%;
  1796 + left: 50%;
  1797 + margin-left: -30rpx;
  1798 + border: 3px #dfdfdf solid;
  1799 + text-align: center;
  1800 + line-height: 60rpx;
  1801 + color: #fff;
  1802 + margin-bottom: 10rpx;
  1803 +}
  1804 +
  1805 +.wf .item .item_txy.hs {
  1806 + background: #cbcbcb;
  1807 +}
  1808 +
  1809 +.po {
  1810 + margin-bottom: 20rpx;
  1811 +}
  1812 +
  1813 +.cart-btn.line-h {
  1814 + line-height: 26rpx;
  1815 +}
  1816 +
  1817 +.cart-btn .fir-v {
  1818 + margin-top: 10rpx;
  1819 +}
  1820 +
  1821 +.hyt {
  1822 + padding: 0 20rpx;
  1823 + font-size: 30rpx;
  1824 + display: flex;
  1825 + align-items: center;
  1826 + margin-top: 10rpx;
  1827 +}
  1828 +
  1829 +.hyt .r_f {
  1830 + color: #e9120f;
  1831 + font-size: 26rpx;
  1832 + position: relative;
  1833 + top: 3rpx
  1834 +}
  1835 +
  1836 +.hyt .byj {
  1837 + color: #e9120f;
  1838 + font-size: 32rpx;
  1839 + position: relative;
  1840 + top: 5rpx
  1841 +}
  1842 +
  1843 +.pt_fir .pt_fir_title.no-mar-b {
  1844 + margin-bottom: 0;
  1845 + padding-bottom: 10rpx;
  1846 + margin-left: 20rpx
  1847 +}
  1848 +
  1849 +.pt_fir .pt_fir_title.boder-1 {
  1850 + border-bottom: 1rpx #e7e7e7 solid
  1851 +}
  1852 +
  1853 +.jie_price {
  1854 + padding: 10rpx 30rpx;
  1855 +}
  1856 +
  1857 +.jie_price_title {
  1858 + font-size: 30rpx;
  1859 + color: #a26270;
  1860 + margin-bottom: 10rpx
  1861 +}
  1862 +
  1863 +.price_list {
  1864 + display: flex;
  1865 + width: 100%;
  1866 +}
  1867 +
  1868 +.price_item {
  1869 + width: 25%;
  1870 + font-size: 28rpx;
  1871 + color: #4c336c
  1872 +}
  1873 +
  1874 +.pt_fir.se2 .zzk-1 {
  1875 + margin-top: 23rpx;
  1876 + font-size: 30rpx;
  1877 + position: relative;
  1878 + margin-bottom: 30rpx;
  1879 + border-left: 4rpx solid red;
  1880 + margin-left: 14rpx;
  1881 + height: 30rpx;
  1882 + line-height: 30rpx;
  1883 + padding-left: 5rpx;
  1884 +}
  1885 +
  1886 +.ckgd {
  1887 + position: absolute;
  1888 + top: 0;
  1889 + right: 57rpx;
  1890 + color: #d70025;
  1891 + font-size: 32rpx;
  1892 +}
  1893 +
  1894 +.ckgd .arrow-one {
  1895 + width: 18rpx;
  1896 + height: 18rpx;
  1897 + border-color: #da0b31;
  1898 + margin-top: 5rpx;
  1899 +}
  1900 +
  1901 +.bview {
  1902 + position: fixed;
  1903 + top: 0;
  1904 + left: 0;
  1905 + width: 100%;
  1906 + height: 100%;
  1907 + background-color: rgba(0, 0, 0, 0.5);
  1908 +}
  1909 +
  1910 +.juzhong {
  1911 + position: fixed;
  1912 + top: 0;
  1913 + left: 0;
  1914 + width: 100%;
  1915 + height: 100%;
  1916 + display: flex;
  1917 + flex-direction: row;
  1918 + justify-content: center;
  1919 + align-items: center;
  1920 +}
  1921 +
  1922 +.juzhong .xq {
  1923 + padding: 0 20rpx;
  1924 + background: #fff;
  1925 + font-size: 30rpx;
  1926 + padding-bottom: 20rpx;
  1927 +}
  1928 +
  1929 +.juzhong .xq .title {
  1930 + text-align: center;
  1931 + margin: 20rpx 0;
  1932 + position: relative;
  1933 + height: 50rpx;
  1934 +}
  1935 +
  1936 +.juzhong .xq .hs1 {
  1937 + font-size: 28rpx;
  1938 + color: #ab8f9e
  1939 +}
  1940 +
  1941 +.juzhong .xq .title .close {
  1942 + position: absolute;
  1943 + top: 0;
  1944 + right: 0;
  1945 + width: 45rpx;
  1946 + height: 45rpx;
  1947 +}
  1948 +
  1949 +.pt_qd {
  1950 + margin-top: 40rpx;
  1951 + height: auto;
  1952 +}
  1953 +
  1954 +.spec-cart-btn.w100 {
  1955 + width: 95%;
  1956 + margin-left: 0;
  1957 + height: 75rpx;
  1958 + line-height: 75rpx;
  1959 + margin: auto;
  1960 +}
  1961 +
  1962 +.sto_v {
  1963 + color: #333;
  1964 +}
  1965 +
  1966 +.ellipsis {
  1967 + overflow: hidden;
  1968 + white-space: nowrap;
  1969 + text-overflow: ellipsis;
  1970 +}
  1971 +
  1972 +
  1973 +
  1974 +
  1975 +/* 房子图标 */
  1976 +.stores-img {
  1977 + width: 40rpx;
  1978 + height: 35rpx;
  1979 + margin-right: 10rpx;
  1980 +}
  1981 +
  1982 +.right-arrow {
  1983 + width: 15rpx;
  1984 + height: 15rpx;
  1985 + border-top: 2rpx solid #d70026;
  1986 + border-right: 2rpx solid #d70026;
  1987 + transform: rotate(45deg);
  1988 + display: inline-block;
  1989 + margin-bottom: 3rpx;
  1990 +}
  1991 +
  1992 +.distance{
  1993 + padding-left: 15rpx;
  1994 + padding-right: 15rpx;
  1995 + background: #eee;
  1996 + border-radius: 20rpx;
  1997 + margin-right: 5rpx;
  1998 + color: #999;
  1999 + height: 38rpx;
  2000 + line-height: 38rpx;
  2001 +}
  2002 +
  2003 +.shop_name{
  2004 + margin-right: 10rpx;
  2005 +}
  2006 +
  2007 +.xc-distance-top{
  2008 + margin-top: 10rpx;
  2009 +}
  2010 +
  2011 +
  2012 +.popup-frame{
  2013 + position: fixed;
  2014 + /* bottom:99rpx; */
  2015 + bottom: 0;
  2016 + z-index: 20;
  2017 + background: white;
  2018 + width: 100%;
  2019 + border-radius: 20rpx 20rpx 0 0;
  2020 + height: 72%;
  2021 +}
  2022 +
  2023 +.popup-top{
  2024 + border-bottom: 1rpx solid #eee;
  2025 + height: 155rpx;
  2026 + width: 95%;
  2027 + margin: auto;
  2028 + line-height: 155rpx;
  2029 +
  2030 +}
  2031 +
  2032 +
  2033 +/* .flex-space-between{
  2034 + display: flex;
  2035 + justify-content:space-between;
  2036 +} */
  2037 +
  2038 +.modal-closes {
  2039 + position: absolute;
  2040 + right: 30rpx;
  2041 + top: -15rpx;
  2042 + height: 25rpx;
  2043 +}
  2044 +
  2045 +.choose_more{
  2046 + margin-top: 40rpx;
  2047 + margin-right: 20rpx;
  2048 +
  2049 +}
  2050 +.choose_mores{
  2051 + margin-top: 30rpx;
  2052 + margin-right: 15rpx;
  2053 +
  2054 +}
  2055 +
  2056 +.bg_rights{
  2057 + border-top: 2rpx solid ;
  2058 + border-right: 2rpx solid ;
  2059 + transform: rotate(45deg);
  2060 + display: inline-block;
  2061 + width: 15rpx;height:15rpx;
  2062 + border-color: #da0b31;
  2063 +}
  2064 +
  2065 +
  2066 +.mongolia-layer{
  2067 + position: fixed;
  2068 + left: 0;
  2069 + top: 0;
  2070 + right: 0;
  2071 + bottom: 0;
  2072 + z-index: 11;
  2073 + background: rgba(0,0,0,0.4);
  2074 + width: 100%;
  2075 + height: 91.9%;
  2076 +}
  2077 +
  2078 +
  2079 +
  2080 +
  2081 +.store-list{
  2082 + width: 95%;
  2083 + height: 72%;
  2084 + overflow-y: scroll;
  2085 + margin: auto;
  2086 +}
  2087 +
  2088 +.store-list .store_choose{
  2089 + width: 100%;
  2090 + height: 120rpx;
  2091 + line-height: 125rpx;
  2092 + border-bottom: 1rpx solid #eee;
  2093 +}
  2094 +
  2095 +.store-list .store_choose .store{
  2096 + width: 100%;
  2097 + margin: auto;
  2098 + line-height: 37rpx;
  2099 + padding-left: 20rpx;
  2100 +}
  2101 +
  2102 +.xc-hook{
  2103 + width: 35rpx;
  2104 + height: 35rpx;
  2105 + transform: rotate(-145deg);
  2106 + line-height: 37rpx;
  2107 + text-align: center;
  2108 +}
  2109 +
  2110 +.butttem5{
  2111 + margin-bottom: 5rpx;
  2112 +}
  2113 +
  2114 +.address-frame{
  2115 + width: 93%;
  2116 + margin-left: 7rpx;
  2117 +}
  2118 +
  2119 +.store-bottom{
  2120 + width: 85%;
  2121 + margin: auto;
  2122 + height: 70rpx;
  2123 + }
  2124 +
  2125 + .determine{
  2126 + width: 260rpx;
  2127 + height: 55rpx;
  2128 + border-radius: 50rpx;
  2129 + line-height: 55rpx;
  2130 + }
  2131 +
  2132 + .default{
  2133 + width: 260rpx;
  2134 + height: 55rpx;
  2135 + border:3rpx solid #c8c8c8;
  2136 + border-radius: 50rpx;
  2137 + line-height: 55rpx;
  2138 + }
  2139 +
  2140 + .sort_store_list .sort-store-frame .sort-store {
  2141 + width: 94.5%;
  2142 + margin: auto;
  2143 + }
  2144 +
  2145 +
  2146 + .sort_store_list .sort-store-frame{
  2147 + width: 100%;
  2148 + height: 100rpx;
  2149 + line-height:100rpx;
  2150 + border-bottom: 1rpx solid #eee;
  2151 + }
  2152 +
  2153 + .black_rights-frame .black_rights{
  2154 + border-top: 3rpx solid;
  2155 + border-right: 3rpx solid;
  2156 + transform: rotate(45deg);
  2157 + display: inline-block;
  2158 + width: 20rpx;
  2159 + height: 20rpx;
  2160 + }
  2161 +
  2162 +
  2163 + .sort_store_list{
  2164 + height: 82%;
  2165 + overflow: hidden;
  2166 + overflow-y: scroll;
  2167 + width: 95%;
  2168 + margin: auto;
  2169 + }
  2170 +
  2171 + .xc-hooks{
  2172 + width: 30rpx;
  2173 + height: 30rpx;
  2174 + border: 1rpx solid #999;
  2175 +}
... ...
pages/user/assistance/task_assistance.js
  Edit  View file @dff3310
... ... @@ -64,7 +64,8 @@ Page({
64 64 djs: "", //定时器的显示
65 65 //*********************************************end
66 66  
67   - Hei: 0,
  67 + // Hei: 0,
  68 + max_sw_height: 0,
68 69 },
69 70  
70 71 /**
... ... @@ -1076,16 +1077,34 @@ Page({
1076 1077 },
1077 1078  
1078 1079  
1079   - imgH:function(e){
  1080 + // imgH:function(e){
1080 1081  
1081   - var winWid = wx.getSystemInfoSync().windowWidth; //获取当前屏幕的宽度
1082   - var imgh = e.detail.height;　　　　　　　　　　　　　　　　//图片高度
1083   - var imgw = e.detail.width;
1084   - var swiperH = winWid*0.827*imgh/imgw + "px"　　　　　　　　　　//等比设置swiper的高度。 即 屏幕宽度 / swiper高度 = 图片宽度 / 图片高度 ==》swiper高度 = 屏幕宽度 * 图片高度 / 图片宽度
1085   - console.log('imgload',winWid, imgh, imgw, swiperH);
  1082 + // var winWid = wx.getSystemInfoSync().windowWidth; //获取当前屏幕的宽度
  1083 + // var imgh = e.detail.height;　　　　　　　　　　　　　　　　//图片高度
  1084 + // var imgw = e.detail.width;
  1085 + // var swiperH = winWid*0.827*imgh/imgw + "px"　　　　　　　　　　//等比设置swiper的高度。 即 屏幕宽度 / swiper高度 = 图片宽度 / 图片高度 ==》swiper高度 = 屏幕宽度 * 图片高度 / 图片宽度
  1086 + // console.log('imgload',winWid, imgh, imgw, swiperH);
  1087 + // this.setData({
  1088 + // Hei:swiperH　　　　　　　　//设置高度
  1089 + // })
  1090 +
  1091 + // imgs
  1092 + // },
  1093 +
  1094 +
  1095 + imageLoad: function(e) {
  1096 + var winWid = wx.getSystemInfoSync().windowWidth;
  1097 + var imgwidth = e.detail.width;
  1098 + var imgheight = e.detail.height;
  1099 + //宽高比
  1100 + var ratio = imgwidth / imgheight;
  1101 + //计算的高度值
  1102 + var viewHeight = winWid / ratio * 0.8;
  1103 + if (this.data.max_sw_height < viewHeight) {
1086 1104 this.setData({
1087   - Hei:swiperH　　　　　　　　//设置高度
1088   - })
  1105 + max_sw_height: viewHeight
  1106 + });
  1107 + };
1089 1108 },
1090 1109  
1091 1110 })
... ...
pages/user/assistance/task_assistance.wxml
  Edit  View file @dff3310
1 1 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
2   -<view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
  2 +<view class="top-back" style="padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
  3 +<!-- <view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> -->
3 4 <!-- 助力活动头部 -->
4 5 <view class="top-frame">
5 6 <view class="flex-center">
... ... @@ -16,15 +17,15 @@
16 17 </view>
17 18 </view>
18 19 <!-- 图片的轮播图 -->
19   - <view class="xc-specific-more-frame flex-center" style="height:{{Hei}};">
  20 + <view class="xc-specific-more-frame flex-center" style="height:{{max_sw_height}}px;">
20 21 <view bindtap="click_pre">
21 22 <view class="bg_left xc-left bcolor"></view>
22 23 </view>
23 24 <!-- <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> -->
24   - <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}" style='width:82.7%;height: 100%;'>
  25 + <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}" style='width:80%;height:100%;'>
25 26 <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
26 27  
27   - <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}" src="{{aitem.giftBagUrl!=null&&aitem.giftBagUrl!=''?iurl+aitem.giftBagUrl:swpie_img}}" mode="widthFix" bindload='imgH' style="width: 100%;display: block;"></image>
  28 + <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}" src="{{aitem.giftBagUrl!=null&&aitem.giftBagUrl!=''?iurl+aitem.giftBagUrl:swpie_img}}" mode="widthFix" bindload='imageLoad' style="width: 100%;display: block;"></image>
28 29 <view bindtap="libao_details" data-taskid="{{aitem.id}}" class="abs select_details fs26 white">礼包详情</view>
29 30  
30 31 </swiper-item>
... ... @@ -65,7 +66,8 @@
65 66  
66 67 </view>
67 68 <!-- 底部列表 -->
68   -<view style="margin-top:{{is_user_task!=null?52:0}}rpx">
  69 +<view>
  70 +<!-- <view style="margin-top:{{is_user_task!=null?52:0}}rpx"> -->
69 71 <!-- 标题 -->
70 72  
71 73 <view class="flex-vertical-between fs28 padding head">
... ...
pages/user/assistance/task_assistance.wxss
  Edit  View file @dff3310
... ... @@ -16,6 +16,7 @@ page {
16 16 /* height:65%; */
17 17 background-repead: no-repead;
18 18 background-size: 100% 100%;
  19 + padding-bottom: 50rpx;
19 20 }
20 21  
21 22 .top-frame {
... ... @@ -236,4 +237,9 @@ line-height: 48rpx;
236 237 .bottom{
237 238 margin-bottom: 50rpx;
238 239 margin-top: 20rpx;
  240 +}
  241 +
  242 +.rel {
  243 + display: flex;
  244 + align-items: center;
239 245 }
240 246 \ No newline at end of file
... ...
pages/user/index/index.js
  Edit  View file @dff3310
... ... @@ -76,6 +76,16 @@ Page({
76 76 * 生命周期函数--监听页面显示
77 77 */
78 78 onShow: function() {
  79 +
  80 +
  81 + if (typeof this.getTabBar === 'function' && this.getTabBar()) {
  82 + var index=getApp().getPageIndex(this);
  83 + this.getTabBar().setData({
  84 + active: index //数字是当前页面在tabbar的索引
  85 + });
  86 +
  87 + getApp().requestCardNum(this);
  88 + }
79 89  
80 90 this.is_assistance();
81 91 var stoid = app_d.setting.stoid;
... ... @@ -85,7 +95,6 @@ Page({
85 95 cur_g_num = 0;
86 96  
87 97 //调用底部导航
88   - getApp().editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
89 98 getApp().get_isbuy(th.setappdata);
90 99 setTimeout(function () {
91 100 if (getApp().globalData.user_id) getApp().requestCardNum(th);
... ... @@ -638,9 +647,14 @@ Page({
638 647  
639 648 }
640 649 })
641   - }
642   -
643   -
644   -
  650 + },
  651 +
  652 + //导航跳转
  653 + nav_goto:function(e){
  654 + var url=e.currentTarget.dataset.url;
  655 + if(!url || url=='') return;
  656 + if(url[0]!='/') url='/'+url;
  657 + getApp().goto(url);
  658 + }
645 659  
646 660 })
... ...
pages/user/index/index.wxml
  Edit  View file @dff3310
1   -<import src="../../tabbar/tabbar.wxml" />
2   -<template is="tabBar" data="{{tabBar}}" />
  1 +<!-- <import src="../../tabbar/tabbar.wxml" />
  2 +<template is="tabBar" data="{{tabBar}}" /> -->
3 3  
4 4 <view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
5 5 <view class="xc-user">
... ...