Commit 281cf283f9ad70a836e6923a130bd3df1d7bf2b1

Authored by 后端研发-苏泰源
1 parent 6ac775ef

卡项自定义模版修改

components/diy_serviceCard/diy_serviceCard.js
1 var t = getApp(), 1 var t = getApp(),
2 - a = t.request,  
3 - o = t.globalData.setting,  
4 - os = o,  
5 - i = require("../../utils/util.js"),  
6 - ut = i,  
7 - s = require("../../utils/common.js"); 2 + a = t.request,
  3 + o = t.globalData.setting,
  4 + os = o,
  5 + i = require("../../utils/util.js"),
  6 + ut = i,
  7 + s = require("../../utils/common.js");
8 var regeneratorRuntime = require('../../utils/runtime.js'); 8 var regeneratorRuntime = require('../../utils/runtime.js');
9 9
10 Component({ 10 Component({
11 options: { 11 options: {
12 addGlobalClass: true, 12 addGlobalClass: true,
13 }, 13 },
14 - properties: {  
15 - // 这里定义了innerText属性,属性值可以在组件使用时指定  
16 - object: {  
17 - type: Object,  
18 - value: null,  
19 - },  
20 -  
21 - },  
22 - data: {  
23 - // 这里是一些组件内部数据  
24 - group: false,  
25 - imghost: o.imghost,  
26 - is_recommend: 0,  
27 - is_hot: 0,  
28 - is_new: 0,  
29 - baseUrl: "/api/weshop/goods/page",  
30 - resourceUrl: t.globalData.setting.resourceUrl,  
31 - url: t.globalData.setting.imghost,  
32 - currentPage: 1,  
33 - requestData: null,  
34 - requestUrl: "",  
35 - goods_array: null,  
36 - total: null,  
37 - prom_id: 0,  
38 - classstyle_id: null,  
39 - g_id: null,  
40 - wgroup: null,  
41 - goods_btn: null,  
42 - loadText: '加载更多',  
43 - someData: {},  
44 - goodscount: null,  
45 - firist_type_data: null,  
46 - firist_type_curr: 0,  
47 - is_nav:0,  
48 - nav_list:null,  
49 - title_index:0,  
50 - swiper_hei:0,  
51 - title_class:"",  
52 - },  
53 -  
54 - ready: function () {},  
55 -  
56 - lifetimes: {  
57 - attached: function() {  
58 -  
59 -  
60 - //要兼容性的写法,因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法  
61 - var nav_item=this.data.object;  
62 - var nav_list= this.data.object.nav_list;  
63 -  
64 - if(parseInt(nav_item.is_automore)){  
65 - if(!getApp().globalData.func_list) getApp().globalData.func_list=[];  
66 - getApp().globalData.func_list.push(this);  
67 - }  
68 -  
69 -  
70 - //最新的版本才有nav_list  
71 - if(nav_list){  
72 - nav_item=nav_list[0];  
73 - //要算一下商品goodsid  
74 - for(var ij in nav_list){  
75 - var item=nav_list[ij];  
76 - var idlist="";  
77 - //如果商品有手动选择的时候  
78 - if(item.data && item.data.length>0){  
79 - for(var im in item.data){  
80 - idlist+= item.data[im]+",";  
81 - }  
82 - }  
83 - if(idlist) idlist=ut.sub_last(idlist);  
84 - nav_list[ij].idlist=idlist;  
85 - }  
86 - this.setData({nav_list:nav_list,is_nav:parseInt(this.data.object.is_nav)});  
87 - }  
88 -  
89 - // 在组件实例进入页面节点树时执行  
90 - if(nav_item) {  
91 - this.data.classstyle_id = nav_item.classstyle;  
92 - this.data.wgroup =nav_item.wgroup;  
93 - }  
94 -  
95 - this.data.goodscount = this.data.object.goodscount;  
96 -  
97 -  
98 - var hei=280;  
99 - if(this.data.object.goodstit) hei+=80;  
100 - if(this.data.object.goodsprice) hei+=80;  
101 - if(this.data.object.goodsnum) hei+=80;  
102 -  
103 - if(this.data.object.title_color){  
104 - this.data.title_class=`color:${this.data.object.title_color};`  
105 - } 14 + properties: {
  15 + // 这里定义了innerText属性,属性值可以在组件使用时指定
  16 + object: {
  17 + type: Object,
  18 + value: null,
  19 + },
106 20
107 - if(this.data.object.title_font_size){  
108 - this.data.title_class=this.data.title_class.concat(`font-size:${this.data.object.title_font_size}px;`)  
109 - }  
110 - this.setData({  
111 - swiper_hei:hei,  
112 - title_class:this.data.title_class,  
113 - });  
114 -  
115 - if (nav_item && nav_item.goodsclass == 1) {  
116 - this.data.is_recommend = 1  
117 - }  
118 - if (nav_item && nav_item.goodsclass == 2) {  
119 - this.data.is_hot = 1  
120 - }  
121 - if (nav_item && nav_item.goodsclass == 3) {  
122 - this.data.is_new = 1  
123 - }  
124 -  
125 - this.data.requestData = new Array();  
126 - this.data.g_id = nav_item.data;  
127 - var arr = [];  
128 -  
129 - for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {  
130 - arr.push(this.data.g_id.slice(i, i + this.data.goodscount));  
131 - }  
132 - this.data.firist_type_data = arr;  
133 - this.init(this.data.classstyle_id, this.data.wgroup);  
134 - },  
135 - detached: function() {  
136 - // 在组件实例被从页面节点树移除时执行  
137 - },  
138 - },  
139 -  
140 - pageLifetimes: {  
141 - //游客登录后,只要更新卡的情况  
142 - show: function () {  
143 - //--初始化卡类--  
144 - this.card_init();  
145 - },  
146 - },  
147 -  
148 - methods: {  
149 - // 这里是一个自定义方法  
150 - init:async function (classstyle_id, wgroup) {  
151 -  
152 - this.setData({classstyle_id:classstyle_id})  
153 -  
154 - var th = this;  
155 - var g_id = this.data.g_id;  
156 - var len=this.data.firist_type_data.length;  
157 - if (classstyle_id == 1) {  
158 - //---手动选择的时候---  
159 - g_id = this.data.firist_type_data[th.data.firist_type_curr];  
160 - th.data.firist_type_curr++;  
161 - }  
162 -  
163 - var th = this,  
164 - app = getApp(),  
165 - index = 0,  
166 - gdata = [];  
167 -  
168 - var user_id=getApp().globalData.user_id;  
169 - if(!user_id) user_id=0;  
170 -  
171 - //--初始化卡类--  
172 - th.card_init();  
173 - var os=getApp().globalData.setting;  
174 - classstyle_id = classstyle_id + "";  
175 - switch (classstyle_id) {  
176 - //---手动选择商品---  
177 - case "1":  
178 - var str="";  
179 - for (var i = 0; i < g_id.length; i++) {  
180 - str += g_id[i].goodsid + ",";  
181 - }  
182 - str=str.substring(0, str.length - 1);  
183 -  
184 - await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str, {  
185 - data:{user_id:user_id},  
186 - isShowLoading:false,  
187 - success: function(res) {  
188 - th.data.loading=0;  
189 -  
190 - if(res.data.code==0 && res.data.data){  
191 -  
192 - var goods = res.data.data;  
193 - /*--  
194 - var rData = th.data.requestData;  
195 - if (rData == null) rData=[];  
196 - var now=ut.gettimestamp();  
197 -  
198 - var new_arr=[];  
199 - for (var ii in res.data.data){  
200 - var item=res.data.data[ii];  
201 - item.goods_img=th.data.imghost + item.original_img;  
202 - if(item.e_time<now) {item.prom_type=0; item.prom_price=0;}  
203 - if(item.warm_uptime>now) {item.prom_type=0; item.prom_price=0;}  
204 - new_arr.push(item);  
205 - }  
206 - rData = rData.concat(new_arr);  
207 -  
208 - th.data.requestData = rData;  
209 -  
210 - if(th.data.object.column==5){  
211 - var arr = new Array();  
212 - //--三个三个一组---  
213 - for(var i=0;i< rData.length;i+=3){  
214 - arr.push(rData.slice(i,i+3));  
215 - }  
216 - th.setData({ goods_array: arr });  
217 - }else{  
218 - th.setData({ goods_array: rData });  
219 - }--*/  
220 -  
221 - th.set_good(goods);  
222 -  
223 - //---控制有没有加载更多的按钮---  
224 - if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); }  
225 - else th.setData({ goods_btn: [1,2]}); 21 + },
  22 + data: {
  23 + // 这里是一些组件内部数据
  24 + group: false,
  25 + imghost: o.imghost,
  26 + is_recommend: 0,
  27 + is_hot: 0,
  28 + is_new: 0,
  29 + baseUrl: "/api/weshop/goods/page",
  30 + resourceUrl: t.globalData.setting.resourceUrl,
  31 + url: t.globalData.setting.imghost,
  32 + currentPage: 1,
  33 + requestData: null,
  34 + requestUrl: "",
  35 + goods_array: null,
  36 + total: null,
  37 + prom_id: 0,
  38 + classstyle_id: null,
  39 + g_id: null,
  40 + wgroup: null,
  41 + goods_btn: null,
  42 + loadText: '加载更多',
  43 + someData: {},
  44 + goodscount: null,
  45 + firist_type_data: null,
  46 + firist_type_curr: 0,
  47 + is_nav: 0,
  48 + nav_list: null,
  49 + title_index: 0,
  50 + swiper_hei: 0,
  51 + title_class: "",
  52 + },
  53 +
  54 + ready: function() {},
  55 +
  56 + lifetimes: {
  57 + attached: function() {
  58 + //要兼容性的写法,因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法
  59 + var nav_item = this.data.object;
  60 + var nav_list = this.data.object.nav_list;
  61 +
  62 + if (parseInt(nav_item.is_automore)) {
  63 + if (!getApp().globalData.func_list) getApp().globalData.func_list = [];
  64 + getApp().globalData.func_list.push(this);
  65 + }
  66 +
  67 +
  68 + //最新的版本才有nav_list
  69 + if (nav_list) {
  70 + nav_item = nav_list[0];
  71 + //要算一下商品goodsid
  72 + for (var ij in nav_list) {
  73 + var item = nav_list[ij];
  74 + var idlist = "";
  75 + //如果商品有手动选择的时候
  76 + if (item.data && item.data.length > 0) {
  77 + for (var im in item.data) {
  78 + idlist += item.data[im] + ",";
  79 + }
226 } 80 }
  81 + if (idlist) idlist = ut.sub_last(idlist);
  82 + nav_list[ij].idlist = idlist;
227 } 83 }
228 -  
229 - })  
230 -  
231 - break;  
232 - case "2":  
233 - var item = {};  
234 - var r_data={  
235 - store_id: os.stoid ,  
236 - pageSize: th.data.goodscount,  
237 - page: th.data.currentPage,  
238 - isonsale: 1,  
239 - orderField: "sort",  
240 - orderType: 'asc',  
241 - };  
242 - if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend;  
243 - if(th.data.is_hot) r_data.is_hot=th.data.is_hot;  
244 - if(th.data.is_new) r_data.is_new=th.data.is_new;  
245 -  
246 - var user_id=getApp().globalData.user_id;  
247 - if(!user_id) user_id=0;  
248 - r_data.user_id=user_id;  
249 -  
250 - await app.request.promiseGet("/api/weshop/goods/page", {  
251 - data:r_data  
252 - }).then(res => {  
253 - th.data.loading=0;  
254 - //商品地址  
255 - var goods = res.data.data.pageData;  
256 - th.setData({  
257 - goods_btn: res.data.data.pageData,  
258 - total: res.data.data.total  
259 - })  
260 - th.data.currentPage++;  
261 - //设置商品熏染  
262 - th.set_good(goods);  
263 -  
264 - })  
265 - break;  
266 - case "3":  
267 - var item = {};  
268 - await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {  
269 - data: {  
270 - store_id:os.stoid ,  
271 - gpid: wgroup,  
272 - pageSize: th.data.goodscount,  
273 - page: th.data.currentPage,  
274 - isonsale: 1,  
275 - orderField: "sort",  
276 - orderType: 'asc',  
277 - user_id:user_id  
278 - }  
279 - }).then(res => {  
280 - th.data.loading=0;  
281 - //商品地址  
282 - var goods = res.data.data.pageData;  
283 - th.setData({  
284 - goods_btn: res.data.data.pageData, total: res.data.data.total  
285 - })  
286 -  
287 - th.data.currentPage++;  
288 - //设置商品熏染  
289 - th.set_good(goods);  
290 -  
291 - })  
292 - break;  
293 - }  
294 - },  
295 -  
296 - setLoading: function () {  
297 - var that = this;  
298 - if(this.data.loading) return false;  
299 - this.data.loading=1;  
300 - that.init(that.data.classstyle_id, that.data.wgroup);  
301 - },  
302 -  
303 - //图片失败,默认图片  
304 - bind_bnerr3: function (e) {  
305 - var _errImg = e.target.dataset.errorimg;  
306 - var _errObj = {};  
307 - _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";  
308 - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
309 - },  
310 -  
311 - //---卡的初始化----  
312 - card_init: function() {  
313 - var th = this,os=getApp().globalData.setting;  
314 - if(!getApp().globalData.user_id) return false;  
315 - getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {  
316 - isShowLoading:false,  
317 - success: function(e) {  
318 - getApp().globalData.userInfo = e.data.data;  
319 - getApp().getConfig2(function(e) {  
320 - var swithc_list = e.switch_list;  
321 - var sw_arr = JSON.parse(swithc_list);  
322 - //---如果后台又开等级卡的开关---  
323 - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {  
324 - th.setData({  
325 - rank_switch: true  
326 - });  
327 - //---回调卡的列表---  
328 - th.getPlusCardType(function(ob) {  
329 - th.setData({  
330 - card_list: ob.card_list  
331 - });  
332 - var ti = setInterval(function() {  
333 - var user = getApp().globalData.userInfo;  
334 - if (!user) return false;  
335 - clearInterval(ti);  
336 -  
337 - if (user.card_field && user['card_expiredate']) {  
338 - var str = user['card_expiredate'].replace(/-/g, '/');  
339 - var end = new Date(str);  
340 - end = Date.parse(end) / 1000;  
341 - var now = ut.gettimestamp();  
342 -  
343 - //--- 判断是等级会员,且在有效期范围内 ---  
344 - if (user.card_field && now < end) {  
345 - var card_name = ob.name_map.get(user.card_field);  
346 - if (card_name.length > 4) card_name = card_name.substring(0, 4);  
347 - th.setData({  
348 - card_field: user.card_field,  
349 - card_name: card_name,  
350 - card_list: ob.card_list  
351 - });  
352 - }  
353 -  
354 - }  
355 -  
356 - }, 500)  
357 - })  
358 -  
359 - }  
360 - })  
361 - }  
362 - })  
363 -  
364 - },  
365 -  
366 - //--- 获取卡类列表 ---  
367 - getPlusCardType: function(func) {  
368 - var storid = o.stoid;  
369 - var th = this;  
370 - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {  
371 - var plusCard = res.data.data;  
372 - var arr = [1219, 2089, 3031];  
373 - var new_arr = new Array();  
374 - var card_name_map = new Map();  
375 -  
376 - var user = getApp().globalData.userInfo;  
377 -  
378 - if(plusCard) {  
379 -  
380 - for (var i = 0; i < plusCard.length; i++) {  
381 - if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {  
382 - continue;  
383 - }  
384 -  
385 - var name = "card" + plusCard[i].CorrPrice.toLowerCase();  
386 - card_name_map.set(name, plusCard[i].CardName);  
387 - new_arr.push(plusCard[i]); 84 + this.setData({
  85 + nav_list: nav_list,
  86 + is_nav: parseInt(this.data.object.is_nav)
  87 + });
  88 + }
  89 +
  90 + // 在组件实例进入页面节点树时执行
  91 + if (nav_item) {
  92 + this.data.classstyle_id = nav_item.classstyle;
  93 + this.data.wgroup = nav_item.wgroup;
  94 + }
  95 +
  96 + this.data.goodscount = this.data.object.goodscount;
  97 +
  98 +
  99 + var hei = 280;
  100 + if (this.data.object.goodstit) hei += 80;
  101 + if (this.data.object.goodsprice) hei += 80;
  102 + if (this.data.object.goodsnum) hei += 80;
  103 +
  104 + if (this.data.object.title_color) {
  105 + this.data.title_class = `color:${this.data.object.title_color};`
  106 + }
  107 +
  108 + if (this.data.object.title_font_size) {
  109 + this.data.title_class = this.data.title_class.concat(`font-size:${this.data.object.title_font_size}px;`)
  110 + }
  111 + this.setData({
  112 + swiper_hei: hei,
  113 + title_class: this.data.title_class,
  114 + });
  115 +
  116 + if (nav_item && nav_item.goodsclass == 1) {
  117 + this.data.is_recommend = 1
  118 + }
  119 + if (nav_item && nav_item.goodsclass == 2) {
  120 + this.data.is_hot = 1
  121 + }
  122 + if (nav_item && nav_item.goodsclass == 3) {
  123 + this.data.is_new = 1
  124 + }
  125 +
  126 + this.data.requestData = new Array();
  127 + this.data.g_id = nav_item.data;
  128 + var arr = [];
  129 +
  130 + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
  131 + arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
388 } 132 }
389 - }  
390 -  
391 - var ob = {  
392 - "card_list": new_arr,  
393 - "name_map": card_name_map  
394 - };  
395 - func(ob);  
396 - }) 133 + this.data.firist_type_data = arr;
  134 + this.init(this.data.classstyle_id, this.data.wgroup);
  135 + },
  136 + detached: function() {
  137 + // 在组件实例被从页面节点树移除时执行
  138 + },
397 }, 139 },
398 -  
399 - //--- 点击tab的事件 ---  
400 - gr_set_nav:function(e){  
401 -  
402 - var title_idx=e.currentTarget.dataset.index;  
403 - if(title_idx==this.data.title_index) return false;  
404 - wx.showLoading();  
405 -  
406 - var nav_item=this.data.object.nav_list[title_idx];  
407 - this.data.g_id =[];  
408 - if(this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)  
409 - this.data.g_id=this.data.object.nav_list[title_idx].data;  
410 - var arr = [];  
411 - for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {  
412 - arr.push(this.data.g_id.slice(i, i + this.data.goodscount));  
413 - }  
414 - this.data.firist_type_data = arr;  
415 - this.data.firist_type_curr=0;  
416 - this.data.requestData=[];  
417 -  
418 - // 在组件实例进入页面节点树时执行  
419 - if(nav_item){  
420 - this.data.classstyle_id = nav_item.classstyle;  
421 - this.data.wgroup =nav_item.wgroup;  
422 - }  
423 -  
424 -  
425 - this.data.is_recommend = this.data.is_hot=this.data.is_new=0;  
426 - //推荐,热卖,新品  
427 - if (nav_item && nav_item.goodsclass == 1) {  
428 - this.data.is_recommend = 1  
429 - }  
430 - if (nav_item && nav_item.goodsclass == 2) {  
431 - this.data.is_hot = 1  
432 - }  
433 - if (nav_item && nav_item.goodsclass == 3) {  
434 - this.data.is_new = 1  
435 - }  
436 -  
437 -  
438 - this.data.currentPage=1;  
439 - this.setData({goods_array:null,total:null,title_index:title_idx});  
440 - //初始化  
441 - this.init(this.data.classstyle_id, this.data.wgroup);  
442 - setTimeout(function(){ wx.hideLoading();},1000) 140 +
  141 + pageLifetimes: {
  142 + //游客登录后,只要更新卡的情况
  143 + show: function() {
  144 + //--初始化卡类--
  145 + // this.card_init();
  146 + },
443 }, 147 },
444 148
445 - //--- 设置 ---  
446 - set_good:async function(goods){  
447 - var now=ut.gettimestamp();  
448 - var th=this;  
449 - if(!goods || goods.length==0) return false;  
450 - var user_id=getApp().globalData.userInfo.user_id;  
451 - if(!user_id) user_id=0;  
452 - for(var i in goods){  
453 - var val=goods[i];  
454 - var item = {};  
455 - var prom_id = null;  
456 - //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {  
457 -  
458 - var url="/api/weshop/activitylist/getGoodActInfo";  
459 - var req_data={  
460 - store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1,user_id:user_id  
461 - };  
462 -  
463 - //获取商品的实际活动  
464 - await getApp().request.promiseGet(url, {data:req_data}).then(res=>{  
465 - if(res.data.code==0 && res.data.data && res.data.data.length==1){  
466 - item.prom_type=res.data.data[0].prom_type;  
467 - item.prom_id=res.data.data[0].act_id;  
468 - }  
469 - })  
470 -  
471 - item.goods_name = val.goods_name;  
472 - item.goods_img = th.data.imghost + val.original_img;  
473 - item.market_price = val.market_price;  
474 - item.shop_price = val.shop_price;  
475 - item.sales_sum = val.sales_sum;  
476 - item.goods_id = val.goods_id;  
477 -  
478 - item.cardprice1 = val.cardprice1;  
479 - item.cardprice2 = val.cardprice2;  
480 - item.cardprice3 = val.cardprice3;  
481 - item.prom_type = val.prom_type;  
482 - item.prom_id = val.prom_id;  
483 -  
484 - if(val.prom_price) item.prom_price = val.prom_price;  
485 - if(val.prom_integral) item.prom_integral = val.prom_integral;  
486 -  
487 - prom_id = val.prom_id;  
488 -  
489 - var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购  
490 -  
491 - var url = "";  
492 -  
493 - switch (prom_type){  
494 - case 1:  
495 - var user_id=getApp().globalData.user_id;  
496 - if(!user_id) user_id=0;  
497 - url = "/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id;  
498 - break;  
499 - case 2:  
500 - url ="/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +val.goods_id+"/"+ prom_id  
501 - break;  
502 - case 4:  
503 - url ="/api/weshop/integralbuy/get/"+os.stoid +"/"+prom_id;  
504 - break;  
505 - case 6:  
506 - url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;  
507 - break;  
508 - case 8:  
509 - var presell_id = prom_id;  
510 - var url1 = "/api/weshop/marketing/marketingPresellList/list";  
511 - var rd= {  
512 - store_id: os.stoid,  
513 - presell_id: presell_id,  
514 - goods_id: val.goods_id  
515 - }  
516 - //------获取预售从表----------  
517 - await getApp().request.promiseGet(url1, {  
518 - data: rd  
519 - }).then(res => {  
520 - if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {  
521 - var arr = res.data.data[0];  
522 - item.prom_price = arr.luck_goods_price;  
523 - item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0);  
524 - }  
525 - })  
526 - break;  
527 - default:  
528 - break  
529 - }  
530 -  
531 - if(url!=null && url!=''){  
532 - await getApp().request.promiseGet(url, {}).then(res => {  
533 - var prom =null;  
534 - if(res && res.data) prom=res.data.data;  
535 - if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {  
536 - item.prom_price = res.data.data.price;  
537 - if(res.data.data.user_price) item.prom_price=res.data.data.user_price;  
538 - var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;  
539 - var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;  
540 - var vNum2=res.data.data.virtual?res.data.data.virtual:0;  
541 - item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);  
542 - }else{  
543 - item.prom_type=0;  
544 - item.prom_id=0;  
545 - item.prom_price=null;  
546 - } 149 + methods: {
  150 + // 这里是一个自定义方法
  151 + init: async function(classstyle_id, wgroup) {
  152 +
  153 + this.setData({
  154 + classstyle_id: classstyle_id
  155 + })
  156 +
  157 + var th = this;
  158 + var g_id = this.data.g_id;
  159 + var len = this.data.firist_type_data.length;
  160 + if (classstyle_id == 1) {
  161 + //---手动选择的时候---
  162 + g_id = this.data.firist_type_data[th.data.firist_type_curr];
  163 + th.data.firist_type_curr++;
  164 + }
547 165
548 - th.data.requestData.push(item);  
549 - })  
550 - }else{  
551 - th.data.requestData.push(item); 166 + var th = this,
  167 + app = getApp(),
  168 + index = 0,
  169 + gdata = [];
  170 +
  171 + var user_id = getApp().globalData.user_id;
  172 + if (!user_id) user_id = 0;
  173 +
  174 + //--初始化卡类--
  175 + // th.card_init();
  176 +
  177 + var os = getApp().globalData.setting;
  178 + classstyle_id = classstyle_id + "";
  179 + switch (classstyle_id) {
  180 + //---手动选择商品---
  181 + case "1":
  182 + var str = "";
  183 + for (var i = 0; i < g_id.length; i++) {
  184 + str += g_id[i].goodsid + ",";
  185 + }
  186 + str = str.substring(0, str.length - 1);
  187 +
  188 + // await app.request.get("/api/weshop/serviceCard/page?store_id=" + os.stoid + "&goodsidlist=" + str, {
  189 + await app.request.get("/api/weshop/serviceCard/page?store_id=" + os.stoid + "&ids=" + str, {
  190 + data: {
  191 + user_id: user_id
  192 + },
  193 + isShowLoading: false,
  194 + success: function(res) {
  195 + th.data.loading = 0;
  196 +
  197 + if (res.data.code == 0 && res.data.data) {
  198 +
  199 + var goods = res.data.data.pageData;
  200 + // console.log('goods', goods);
  201 + // var rData = th.data.requestData;
  202 + // if (rData == null) rData=[];
  203 + // var now=ut.gettimestamp();
  204 +
  205 + // var new_arr=[];
  206 + // for (var ii in res.data.data){
  207 + // var item=res.data.data[ii];
  208 + // item.goods_img=th.data.imghost + item.original_img;
  209 + // if(item.e_time<now) {item.prom_type=0; item.prom_price=0;}
  210 + // if(item.warm_uptime>now) {item.prom_type=0; item.prom_price=0;}
  211 + // new_arr.push(item);
  212 + // }
  213 + // rData = rData.concat(new_arr);
  214 +
  215 + // th.data.requestData = rData;
  216 +
  217 + // if(th.data.object.column==5){
  218 + // var arr = new Array();
  219 + // //--三个三个一组---
  220 + // for(var i=0;i< rData.length;i+=3){
  221 + // arr.push(rData.slice(i,i+3));
  222 + // }
  223 + // th.setData({ goods_array: arr });
  224 + // }else{
  225 + // th.setData({ goods_array: rData });
  226 + // }--
  227 +
  228 + th.set_good(goods);
  229 +
  230 + //---控制有没有加载更多的按钮---
  231 + if (th.data.firist_type_curr >= len) {
  232 + th.setData({
  233 + goods_btn: []
  234 + });
  235 + } else th.setData({
  236 + goods_btn: [1, 2]
  237 + });
  238 + }
  239 + }
  240 +
  241 + })
  242 +
  243 + break;
  244 + case "2":
  245 + var item = {};
  246 + var r_data = {
  247 + store_id: os.stoid,
  248 + pageSize: th.data.goodscount,
  249 + page: th.data.currentPage,
  250 + isonsale: 1,
  251 + orderField: "sort",
  252 + orderType: 'asc',
  253 + };
  254 + if (th.data.is_recommend) r_data.is_recommend = th.data.is_recommend;
  255 + if (th.data.is_hot) r_data.is_hot = th.data.is_hot;
  256 + if (th.data.is_new) r_data.is_new = th.data.is_new;
  257 +
  258 + var user_id = getApp().globalData.user_id;
  259 + if (!user_id) user_id = 0;
  260 + r_data.user_id = user_id;
  261 +
  262 + await app.request.promiseGet("/api/weshop/goods/page", {
  263 + data: r_data
  264 + }).then(res => {
  265 + th.data.loading = 0;
  266 + //商品地址
  267 + var goods = res.data.data.pageData;
  268 + th.setData({
  269 + goods_btn: res.data.data.pageData,
  270 + total: res.data.data.total
  271 + })
  272 + th.data.currentPage++;
  273 + //设置商品熏染
  274 + th.set_good(goods);
  275 +
  276 + })
  277 + break;
  278 + case "3":
  279 + var item = {};
  280 + await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
  281 + data: {
  282 + store_id: os.stoid,
  283 + gpid: wgroup,
  284 + pageSize: th.data.goodscount,
  285 + page: th.data.currentPage,
  286 + isonsale: 1,
  287 + orderField: "sort",
  288 + orderType: 'asc',
  289 + user_id: user_id
  290 + }
  291 + }).then(res => {
  292 + th.data.loading = 0;
  293 + //商品地址
  294 + var goods = res.data.data.pageData;
  295 + th.setData({
  296 + goods_btn: res.data.data.pageData,
  297 + total: res.data.data.total
  298 + })
  299 +
  300 + th.data.currentPage++;
  301 + //设置商品熏染
  302 + th.set_good(goods);
  303 +
  304 + })
  305 + break;
552 } 306 }
553 - }  
554 -  
555 - if(th.data.object.column==5){  
556 - var arr = new Array();  
557 - var rData=th.data.requestData;  
558 - //--三个三个一组---  
559 - for(var i=0;i< rData.length;i+=3){  
560 - arr.push(rData.slice(i,i+3));  
561 - }  
562 - th.setData({ goods_array: arr,page: th.data.currentPage - 1, });  
563 - }else{  
564 - th.setData({  
565 - goods_array: th.data.requestData,  
566 - page: th.data.currentPage - 1, 307 +
  308 + },
  309 +
  310 + setLoading: function() {
  311 + var that = this;
  312 + if (this.data.loading) return false;
  313 + this.data.loading = 1;
  314 + that.init(that.data.classstyle_id, that.data.wgroup);
  315 + },
  316 +
  317 + //图片失败,默认图片
  318 + bind_bnerr3: function(e) {
  319 + var _errImg = e.target.dataset.errorimg;
  320 + var _errObj = {};
  321 + _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
  322 + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  323 + },
  324 +
  325 + //---卡的初始化----
  326 + card_init: function() {
  327 + // var th = this,
  328 + // os = getApp().globalData.setting;
  329 + // if (!getApp().globalData.user_id) return false;
  330 + // getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
  331 + // isShowLoading: false,
  332 + // success: function(e) {
  333 + // getApp().globalData.userInfo = e.data.data;
  334 + // getApp().getConfig2(function(e) {
  335 + // var swithc_list = e.switch_list;
  336 + // var sw_arr = JSON.parse(swithc_list);
  337 + // //---如果后台又开等级卡的开关---
  338 + // if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
  339 + // th.setData({
  340 + // rank_switch: true
  341 + // });
  342 + // //---回调卡的列表---
  343 + // th.getPlusCardType(function(ob) {
  344 + // th.setData({
  345 + // card_list: ob.card_list
  346 + // });
  347 + // var ti = setInterval(function() {
  348 + // var user = getApp().globalData.userInfo;
  349 + // if (!user) return false;
  350 + // clearInterval(ti);
  351 +
  352 + // if (user.card_field && user['card_expiredate']) {
  353 + // var str = user['card_expiredate'].replace(/-/g, '/');
  354 + // var end = new Date(str);
  355 + // end = Date.parse(end) / 1000;
  356 + // var now = ut.gettimestamp();
  357 +
  358 + // //--- 判断是等级会员,且在有效期范围内 ---
  359 + // if (user.card_field && now < end) {
  360 + // var card_name = ob.name_map.get(user.card_field);
  361 + // if (card_name.length > 4) card_name = card_name.substring(0, 4);
  362 + // th.setData({
  363 + // card_field: user.card_field,
  364 + // card_name: card_name,
  365 + // card_list: ob.card_list
  366 + // });
  367 + // }
  368 +
  369 + // }
  370 +
  371 + // }, 500)
  372 + // })
  373 +
  374 + // }
  375 + // })
  376 + // }
  377 + // })
  378 +
  379 + },
  380 +
  381 + //--- 获取卡类列表 ---
  382 + getPlusCardType: function(func) {
  383 + // var storid = o.stoid;
  384 + // var th = this;
  385 + // getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
  386 + // var plusCard = res.data.data;
  387 + // var arr = [1219, 2089, 3031];
  388 + // var new_arr = new Array();
  389 + // var card_name_map = new Map();
  390 +
  391 + // var user = getApp().globalData.userInfo;
  392 +
  393 + // if (plusCard) {
  394 +
  395 + // for (var i = 0; i < plusCard.length; i++) {
  396 + // if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
  397 + // continue;
  398 + // }
  399 +
  400 + // var name = "card" + plusCard[i].CorrPrice.toLowerCase();
  401 + // card_name_map.set(name, plusCard[i].CardName);
  402 + // new_arr.push(plusCard[i]);
  403 + // }
  404 + // }
  405 +
  406 + // var ob = {
  407 + // "card_list": new_arr,
  408 + // "name_map": card_name_map
  409 + // };
  410 + // func(ob);
  411 + // })
  412 + },
  413 +
  414 +
  415 + //--- 点击tab的事件 ---
  416 + gr_set_nav: function(e) {
  417 +
  418 + var title_idx = e.currentTarget.dataset.index;
  419 + if (title_idx == this.data.title_index) return false;
  420 + wx.showLoading();
  421 +
  422 + var nav_item = this.data.object.nav_list[title_idx];
  423 + this.data.g_id = [];
  424 + if (this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)
  425 + this.data.g_id = this.data.object.nav_list[title_idx].data;
  426 + var arr = [];
  427 + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
  428 + // for (var i = 0; i < this.data.g_id.length; i ++) {
  429 + arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
  430 + }
  431 + this.data.firist_type_data = arr;
  432 + this.data.firist_type_curr = 0;
  433 + this.data.requestData = [];
  434 +
  435 + // 在组件实例进入页面节点树时执行
  436 + if (nav_item) {
  437 + this.data.classstyle_id = nav_item.classstyle;
  438 + this.data.wgroup = nav_item.wgroup;
  439 + }
  440 +
  441 +
  442 + this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
  443 + //推荐,热卖,新品
  444 + if (nav_item && nav_item.goodsclass == 1) {
  445 + this.data.is_recommend = 1
  446 + }
  447 + if (nav_item && nav_item.goodsclass == 2) {
  448 + this.data.is_hot = 1
  449 + }
  450 + if (nav_item && nav_item.goodsclass == 3) {
  451 + this.data.is_new = 1
  452 + }
  453 +
  454 +
  455 + this.data.currentPage = 1;
  456 + this.setData({
  457 + goods_array: null,
  458 + total: null,
  459 + title_index: title_idx
567 }); 460 });
  461 + //初始化
  462 + this.init(this.data.classstyle_id, this.data.wgroup);
  463 + setTimeout(function() {
  464 + wx.hideLoading();
  465 + }, 1000)
  466 + },
  467 +
  468 + //--- 设置 ---
  469 + set_good: async function(goods) {
  470 + var now = ut.gettimestamp();
  471 + var th = this;
  472 + if (!goods || goods.length == 0) return false;
  473 + var user_id = getApp().globalData.userInfo.user_id;
  474 + if (!user_id) user_id = 0;
  475 + for (var i in goods) {
  476 + var val = goods[i];
  477 + var item = {};
  478 + var prom_id = null;
  479 + //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
  480 +
  481 + // var url = "/api/weshop/activitylist/getGoodActInfo";
  482 + // var req_data = {
  483 + // store_id: os.stoid,
  484 + // goodsidlist: val.goods_id,
  485 + // is_detail: 1,
  486 + // user_id: user_id
  487 + // };
  488 +
  489 + //获取商品的实际活动
  490 + // await getApp().request.promiseGet(url, {
  491 + // data: req_data
  492 + // }).then(res => {
  493 + // if (res.data.code == 0 && res.data.data && res.data.data.length == 1) {
  494 + // item.prom_type = res.data.data[0].prom_type;
  495 + // item.prom_id = res.data.data[0].act_id;
  496 + // }
  497 + // })
  498 + // console.log('val++++++<<<<<', val);
  499 + item.goods_name = val.serviceName;
  500 + item.goods_img = th.data.imghost + val.imgUrl;
  501 + item.market_price = val.show_price;
  502 + item.shop_price = val.money;
  503 + item.sales_sum = val.sales_sum;
  504 + item.goods_id = val.id;
  505 +
  506 + // item.cardprice1 = val.cardprice1;
  507 + // item.cardprice2 = val.cardprice2;
  508 + // item.cardprice3 = val.cardprice3;
  509 + // item.prom_type = val.prom_type;
  510 + // item.prom_id = val.prom_id;
  511 +
  512 + if (val.prom_price) item.prom_price = val.prom_price;
  513 + if (val.prom_integral) item.prom_integral = val.prom_integral;
  514 +
  515 + prom_id = val.prom_id;
  516 +
  517 + var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购
  518 +
  519 + var url = "";
  520 +
  521 + // switch (prom_type) {
  522 + // case 1:
  523 + // var user_id = getApp().globalData.user_id;
  524 + // if (!user_id) user_id = 0;
  525 + // url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id;
  526 + // break;
  527 + // case 2:
  528 + // url = "/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id
  529 + // break;
  530 + // case 4:
  531 + // url = "/api/weshop/integralbuy/get/" + os.stoid + "/" + prom_id;
  532 + // break;
  533 + // case 6:
  534 + // url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
  535 + // break;
  536 + // case 8:
  537 + // var presell_id = prom_id;
  538 + // var url1 = "/api/weshop/marketing/marketingPresellList/list";
  539 + // var rd = {
  540 + // store_id: os.stoid,
  541 + // presell_id: presell_id,
  542 + // goods_id: val.goods_id
  543 + // }
  544 + // //------获取预售从表----------
  545 + // await getApp().request.promiseGet(url1, {
  546 + // data: rd
  547 + // }).then(res => {
  548 + // if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  549 + // var arr = res.data.data[0];
  550 + // item.prom_price = arr.luck_goods_price;
  551 + // item.sales_sum = arr.buy_goodnum + (arr.virtual_qty ? arr.virtual_qty : 0);
  552 + // }
  553 + // })
  554 + // break;
  555 + // default:
  556 + // break
  557 + // }
  558 +
  559 + if (url != null && url != '') {
  560 + await getApp().request.promiseGet(url, {}).then(res => {
  561 + var prom = null;
  562 + if (res && res.data) prom = res.data.data;
  563 + if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time &&
  564 + prom.show_time < now))) {
  565 + item.prom_price = res.data.data.price;
  566 + if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
  567 + var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0;
  568 + var vNum1 = res.data.data.virtualNum ? res.data.data.virtualNum : 0;
  569 + var vNum2 = res.data.data.virtual ? res.data.data.virtual : 0;
  570 + item.sales_sum = res.data.data.buy_num + (vNum + vNum1 + vNum2);
  571 + } else {
  572 + item.prom_type = 0;
  573 + item.prom_id = 0;
  574 + item.prom_price = null;
  575 + }
  576 +
  577 + th.data.requestData.push(item);
  578 + })
  579 + } else {
  580 + th.data.requestData.push(item);
  581 + }
  582 + }
  583 +
  584 + if (th.data.object.column == 5) {
  585 + var arr = new Array();
  586 + var rData = th.data.requestData;
  587 + //--三个三个一组---
  588 + for (var i = 0; i < rData.length; i += 3) {
  589 + arr.push(rData.slice(i, i + 3));
  590 + }
  591 + th.setData({
  592 + goods_array: arr,
  593 + page: th.data.currentPage - 1,
  594 + });
  595 + } else {
  596 + th.setData({
  597 + goods_array: th.data.requestData,
  598 + page: th.data.currentPage - 1,
  599 + });
  600 + }
  601 +
  602 +
  603 + // console.log('goods_array0000000000====>>>', th.data.goods_array);
  604 +
  605 + },
  606 +
  607 + re_show: function() {
  608 + if (this.data.object.goodscount * this.data.page < this.data.total) {
  609 + this.setLoading()
  610 + }
568 } 611 }
569 -  
570 - },  
571 612
572 - re_show:function () {  
573 - if(this.data.object.goodscount *this.data.page <this.data.total ){  
574 - this.setLoading()  
575 - }  
576 - }  
577 613
578 614
579 615
580 -  
581 - }  
582 -})  
583 \ No newline at end of file 616 \ No newline at end of file
  617 + }
  618 +})
components/diy_serviceCard/diy_serviceCard.wxml
@@ -12,36 +12,32 @@ @@ -12,36 +12,32 @@
12 </block> --> 12 </block> -->
13 13
14 <!-- 服务卡项顶部标题 --> 14 <!-- 服务卡项顶部标题 -->
15 -<scroll-view scroll-x="true" enhanced="true" fast-deceleration="true" show-scrollbar="false"> 15 +<scroll-view scroll-x="true" enhanced="true" fast-deceleration="true" show-scrollbar="false" wx:if="{{is_nav}}">
16 <view class="flex fs28"> 16 <view class="flex fs28">
17 - <view class="scroll-view-item active">标题1</view>  
18 - <view class="scroll-view-item">标题标题2</view>  
19 - <view class="scroll-view-item">标题3</view>  
20 - <view class="scroll-view-item">标题标题标题4</view>  
21 - <view class="scroll-view-item">标题5</view>  
22 - <view class="scroll-view-item">标题6</view>  
23 - <view class="scroll-view-item">标题题7</view>  
24 - <view class="scroll-view-item">标题8</view>  
25 - <view class="scroll-view-item">标题题9</view>  
26 - <view class="scroll-view-item">标题10</view>  
27 - <view class="scroll-view-item">标题11</view>  
28 - <view class="scroll-view-item">标题12222</view> 17 + <view
  18 + wx:for="{{nav_list}}"
  19 + data-index="{{index}}"
  20 + data-idlist="{{item.idlist}}"
  21 + data-wgroup="{{item.wgroup}}"
  22 + data-classstyle="{{item.classstyle}}"
  23 + bindtap="gr_set_nav"
  24 + class="scroll-view-item {{index == title_index ? 'active':''}}"
  25 + style="{{title_class}}">{{item.title}}</view>
29 </view> 26 </view>
30 </scroll-view> 27 </scroll-view>
31 28
32 29
33 <!--1个列表的时候--> 30 <!--1个列表的时候-->
34 <view class="zs_goods_wai" wx:if='{{object.column==1}}'> 31 <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
35 - <block wx:for="{{goods_array}}" > 32 + <block wx:for="{{goods_array}}">
36 <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'> 33 <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
37 - <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">  
38 - <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> --> 34 + <!-- <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> -->
  35 + <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
39 <view class='zs_top rel'> 36 <view class='zs_top rel'>
40 37
41 <block wx:if="{{object.big_order_type==3}}"> 38 <block wx:if="{{object.big_order_type==3}}">
42 <view style="position: relative; width: 100%; height: 100%"> 39 <view style="position: relative; width: 100%; height: 100%">
43 - <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"  
44 - binderror="bind_bnerr3"></image> 40 + <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
45 <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> 41 <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
46 </view> 42 </view>
47 </block> 43 </block>
@@ -68,7 +64,8 @@ @@ -68,7 +64,8 @@
68 </block> 64 </block>
69 </view> 65 </view>
70 <view class='zs_center'> 66 <view class='zs_center'>
71 - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> 67 + <!-- <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> -->
  68 + <view class='zs_wz1'>{{item.goods_name}}</view>
72 <!--如果有显示价格 --> 69 <!--如果有显示价格 -->
73 <view class='zs_wz2' wx:if="{{object.goodsprice}}"> 70 <view class='zs_wz2' wx:if="{{object.goodsprice}}">
74 <block wx:if="{{item.prom_price || item.prom_integral}}"> 71 <block wx:if="{{item.prom_price || item.prom_integral}}">
@@ -190,7 +187,7 @@ @@ -190,7 +187,7 @@
190 <view class="flex flex-wrap" wx:if="{{object.column==2}}" style="padding: 0 10rpx 20rpx 10rpx;"> 187 <view class="flex flex-wrap" wx:if="{{object.column==2}}" style="padding: 0 10rpx 20rpx 10rpx;">
191 <block wx:for="{{goods_array}}" > 188 <block wx:for="{{goods_array}}" >
192 <view class="nav-container"> 189 <view class="nav-container">
193 - <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{g_filter.get_border_type(object.big_order_type)}}"> 190 + <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1 {{g_filter.get_border_type(object.big_order_type)}}">
194 <view class="zs_goods_wai_ban"> 191 <view class="zs_goods_wai_ban">
195 <!-- <view class="zs_goods_ban"> --> 192 <!-- <view class="zs_goods_ban"> -->
196 <!-- <view class='zs_goods_2l'> --> 193 <!-- <view class='zs_goods_2l'> -->
@@ -352,7 +349,7 @@ @@ -352,7 +349,7 @@
352 <view class="flex wrap pdh10"> 349 <view class="flex wrap pdh10">
353 <block wx:for="{{goods_array}}" > 350 <block wx:for="{{goods_array}}" >
354 <view class="nav-box"> 351 <view class="nav-box">
355 - <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> 352 + <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
356 <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}" > 353 <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}" >
357 <view class="zs_goods_san"> 354 <view class="zs_goods_san">
358 <view class='zs_goods_3l'> 355 <view class='zs_goods_3l'>
@@ -511,7 +508,7 @@ @@ -511,7 +508,7 @@
511 <!-- 列表显示 --> 508 <!-- 列表显示 -->
512 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'> 509 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
513 <block wx:for="{{goods_array}}" > 510 <block wx:for="{{goods_array}}" >
514 - <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> 511 + <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
515 <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > 512 <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
516 <view class='zs_top_x'> 513 <view class='zs_top_x'>
517 <block wx:if="{{object.big_order_type==3}}"> 514 <block wx:if="{{object.big_order_type==3}}">
@@ -694,7 +691,7 @@ @@ -694,7 +691,7 @@
694 <view class="sp"> 691 <view class="sp">
695 <swiper-item class="s_it" wx:for="{{goods_array}}"> 692 <swiper-item class="s_it" wx:for="{{goods_array}}">
696 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> 693 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
697 - <navigator url="{{g_filter.get_url_by_type(aitem)}}" style="width: 32%" > 694 + <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" style="width: 32%" >
698 <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"> 695 <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}">
699 <view class='sp_top'> 696 <view class='sp_top'>
700 <view class='s_img' style="position: relative; width: 100%"> 697 <view class='s_img' style="position: relative; width: 100%">
components/diy_serviceCard/diy_serviceCard.wxss
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 width: 56rpx; 104 width: 56rpx;
105 height: 56rpx; 105 height: 56rpx;
106 position: absolute; 106 position: absolute;
107 - left: 0rpx; 107 + left: 10rpx;
108 top: 10rpx; 108 top: 10rpx;
109 } 109 }
110 110
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 width: 56rpx; 112 width: 56rpx;
113 height: 56rpx; 113 height: 56rpx;
114 position: absolute; 114 position: absolute;
115 - right: 0rpx; 115 + right: 10rpx;
116 top: 10rpx; 116 top: 10rpx;
117 } 117 }
118 118
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 width: 56rpx; 120 width: 56rpx;
121 height: 56rpx; 121 height: 56rpx;
122 position: absolute; 122 position: absolute;
123 - left: 0rpx; 123 + left: 10rpx;
124 bottom: 10rpx; 124 bottom: 10rpx;
125 } 125 }
126 126
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 width: 56rpx; 128 width: 56rpx;
129 height: 56rpx; 129 height: 56rpx;
130 position: absolute; 130 position: absolute;
131 - right: 20rpx; 131 + right: 10rpx;
132 bottom: 10rpx; 132 bottom: 10rpx;
133 } 133 }
134 134
@@ -906,17 +906,22 @@ top: 10rpx; @@ -906,17 +906,22 @@ top: 10rpx;
906 906
907 .scroll-view-item { 907 .scroll-view-item {
908 flex-shrink: 0; 908 flex-shrink: 0;
909 - border: 2rpx solid #ddd; 909 + border-width: 2rpx;
  910 + border-style: solid;
  911 + border-color: #ddd;
910 border-radius: 80rpx; 912 border-radius: 80rpx;
911 - padding: 10rpx 20rpx; 913 + padding: 10rpx 30rpx;
912 margin: 20rpx 10rpx; 914 margin: 20rpx 10rpx;
913 /* font-size: 28rpx; */ 915 /* font-size: 28rpx; */
914 box-sizing: border-box; 916 box-sizing: border-box;
  917 + text-align: center;
  918 + /* flex: 1; */
  919 + flex-grow: 1;
915 } 920 }
916 921
917 .scroll-view-item.active { 922 .scroll-view-item.active {
918 - color: red;  
919 - border-color: red; 923 + color: #f2270c;
  924 + border-color: #f2270c !important;
920 } 925 }
921 926
922 927
@@ -925,7 +930,7 @@ top: 10rpx; @@ -925,7 +930,7 @@ top: 10rpx;
925 padding-top: 20rpx; 930 padding-top: 20rpx;
926 padding-left: 10rpx; 931 padding-left: 10rpx;
927 padding-right: 10rpx; 932 padding-right: 10rpx;
928 - flex: 1; 933 + /* flex: 1; */
929 flex-basis: 50%; 934 flex-basis: 50%;
930 } 935 }
931 936