Commit 127973e151c330be7c41213cf6c170829985ec0f
1 parent
2b6ff598
商品首页详情门店选择
Showing
2 changed files
with
362 additions
and
183 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -119,7 +119,12 @@ Page({ | @@ -119,7 +119,12 @@ Page({ | ||
119 | is_show_sto_cat: 1, //是否显示门店分类 | 119 | is_show_sto_cat: 1, //是否显示门店分类 |
120 | only_pk: null, | 120 | only_pk: null, |
121 | all_sto: null, | 121 | all_sto: null, |
122 | - sec_sto: null, | 122 | + sec_sto: null, //选择了的门店分类 |
123 | + pickpu_list:null, //读出的所有门店list | ||
124 | + def_pickpu_list:null, //一开始5个门店list | ||
125 | + sec_pick_index:0, //第二级门店选择ID | ||
126 | + fir_pick_index:0, //第一级门店选择ID | ||
127 | + | ||
123 | //同一条形码的所有商品 | 128 | //同一条形码的所有商品 |
124 | sku_g: null, | 129 | sku_g: null, |
125 | sku_g_pt: null, //---拼单的普通购买--- | 130 | sku_g_pt: null, //---拼单的普通购买--- |
@@ -205,12 +210,18 @@ Page({ | @@ -205,12 +210,18 @@ Page({ | ||
205 | //是否点赞中 | 210 | //是否点赞中 |
206 | iszaning: 0, | 211 | iszaning: 0, |
207 | 212 | ||
208 | - store:0,//选择更多 | 213 | + select_store:0,//选择更多 |
209 | index:1, | 214 | index:1, |
210 | more_store:0,//选择门店 | 215 | more_store:0,//选择门店 |
211 | sort_store:0,//门店分类 | 216 | sort_store:0,//门店分类 |
212 | choice_sort_store:0,//选择分类门店 | 217 | choice_sort_store:0,//选择分类门店 |
213 | new_user:0,//新用户 | 218 | new_user:0,//新用户 |
219 | + | ||
220 | + def_pick_store:null,// 默认的门店 | ||
221 | + lat:null, //维度 | ||
222 | + lon:null, //经度 | ||
223 | + | ||
224 | + is_get_local_ok:0,//获取坐标是否完成 | ||
214 | }, | 225 | }, |
215 | 226 | ||
216 | //------初始化加载---------- | 227 | //------初始化加载---------- |
@@ -219,17 +230,17 @@ Page({ | @@ -219,17 +230,17 @@ Page({ | ||
219 | var ee = this, that=ee,th=ee, | 230 | var ee = this, that=ee,th=ee, |
220 | gid = t.goods_id; | 231 | gid = t.goods_id; |
221 | 232 | ||
222 | - //如果tg_id是空的话,分享回来 | 233 | + //---获取手机地址坐标-- |
234 | + //--如果tg_id是空的话,分享回来-- | ||
223 | if (gid == undefined || gid == null || gid == "") { | 235 | if (gid == undefined || gid == null || gid == "") { |
224 | gid = decodeURIComponent(postdata.scene); | 236 | gid = decodeURIComponent(postdata.scene); |
225 | } | 237 | } |
238 | + ee.setData({ gid: gid }); | ||
226 | 239 | ||
227 | - ee.setData({ | ||
228 | - gid: gid | ||
229 | - }); | ||
230 | - | ||
231 | - | 240 | + //----获取系统参数----- |
232 | getApp().getConfig2(function (e) { | 241 | getApp().getConfig2(function (e) { |
242 | + ee.setData({bconfig:e}); | ||
243 | + | ||
233 | if (e.categoryset.indexOf("," + 1 + ",") != -1) { ee.setData({ is_show_pl: 1 }); } | 244 | if (e.categoryset.indexOf("," + 1 + ",") != -1) { ee.setData({ is_show_pl: 1 }); } |
234 | if (e.categoryset.indexOf("," + 3 + ",") != -1) { ee.setData({ is_show_pp: 1 }); } | 245 | if (e.categoryset.indexOf("," + 3 + ",") != -1) { ee.setData({ is_show_pp: 1 }); } |
235 | if (e.categoryset.indexOf("," + 2 + ",") != -1) { ee.setData({ is_show_gb: 1 }); } | 246 | if (e.categoryset.indexOf("," + 2 + ",") != -1) { ee.setData({ is_show_gb: 1 }); } |
@@ -243,8 +254,23 @@ Page({ | @@ -243,8 +254,23 @@ Page({ | ||
243 | supportPageScroll: !0 | 254 | supportPageScroll: !0 |
244 | }); | 255 | }); |
245 | 256 | ||
246 | - }) | 257 | + if(e.is_sort_storage){ |
258 | + wx.getLocation({ | ||
259 | + type: 'wgs84', | ||
260 | + success: function (res) { | ||
261 | + th.data.lat=res.latitude; | ||
262 | + th.data.lon=res.longitude; | ||
263 | + th.data.is_get_local_ok=1; | ||
264 | + }, | ||
265 | + fail: function (res) { | ||
266 | + th.data.is_get_local_ok=1; | ||
267 | + } | ||
268 | + }) | ||
269 | + }else{ | ||
270 | + th.data.is_get_local_ok=1; | ||
271 | + } | ||
247 | 272 | ||
273 | + }) | ||
248 | 274 | ||
249 | //获取用户设备信息,屏幕宽度 | 275 | //获取用户设备信息,屏幕宽度 |
250 | wx.getSystemInfo({ | 276 | wx.getSystemInfo({ |
@@ -252,6 +278,22 @@ Page({ | @@ -252,6 +278,22 @@ Page({ | ||
252 | that.setData({ screenWidth: res.screenWidth }) | 278 | that.setData({ screenWidth: res.screenWidth }) |
253 | } | 279 | } |
254 | }) | 280 | }) |
281 | + | ||
282 | + //获取用户的默认门店 | ||
283 | + getApp().get_user_store(function (e) { | ||
284 | + var w_time=setInterval(function () { | ||
285 | + if(that.data.is_get_local_ok==0) return false; | ||
286 | + var distance=null; | ||
287 | + if( that.data.lat!=null){ | ||
288 | + distance=Math.sqrt(e.lat*th.data.lat+e.lon*th.data.lon); | ||
289 | + e.distance=distance; | ||
290 | + } | ||
291 | + if(e) that.setData({def_pick_store:e,sto_sele_name:e.pickup_name,sto_sele_id:e.pickup_id,sto_sele_distr:e}) | ||
292 | + clearInterval(w_time); | ||
293 | + },500) | ||
294 | + | ||
295 | + }) | ||
296 | + | ||
255 | }, | 297 | }, |
256 | 298 | ||
257 | //------------程序初始化入口------------- | 299 | //------------程序初始化入口------------- |
@@ -392,13 +434,6 @@ Page({ | @@ -392,13 +434,6 @@ Page({ | ||
392 | mapurl:mapurl, | 434 | mapurl:mapurl, |
393 | }); | 435 | }); |
394 | 436 | ||
395 | - //获取系统参数 | ||
396 | - getApp().getConfig2(function (conf) { | ||
397 | - ee.setData({ | ||
398 | - bconfig:conf, | ||
399 | - }) | ||
400 | - }); | ||
401 | - | ||
402 | ee.requestRecommend(); | 437 | ee.requestRecommend(); |
403 | 438 | ||
404 | }, | 439 | }, |
@@ -457,7 +492,7 @@ Page({ | @@ -457,7 +492,7 @@ Page({ | ||
457 | //-----商品详情--- | 492 | //-----商品详情--- |
458 | a.wxParse("content", "html", t.data.data.goods_content, ee, 6); | 493 | a.wxParse("content", "html", t.data.data.goods_content, ee, 6); |
459 | e.wxParseAddFullImageUrl(ee, "content"); | 494 | e.wxParseAddFullImageUrl(ee, "content"); |
460 | - console.log("商品的名字是什么",t.data.data); | 495 | + |
461 | ee.setData({ | 496 | ee.setData({ |
462 | data: t.data.data, | 497 | data: t.data.data, |
463 | sele_g: t.data.data, | 498 | sele_g: t.data.data, |
@@ -731,7 +766,6 @@ Page({ | @@ -731,7 +766,6 @@ Page({ | ||
731 | if (re.data.data.total > 0) { | 766 | if (re.data.data.total > 0) { |
732 | var item = re.data.data.pageData[0]; | 767 | var item = re.data.data.pageData[0]; |
733 | 768 | ||
734 | - | ||
735 | var updata = { | 769 | var updata = { |
736 | id: item.id, | 770 | id: item.id, |
737 | goods_num: e.data.goodsInputNum + item.goods_num, | 771 | goods_num: e.data.goodsInputNum + item.goods_num, |
@@ -1084,69 +1118,114 @@ Page({ | @@ -1084,69 +1118,114 @@ Page({ | ||
1084 | var gid = e.target.dataset.gid; | 1118 | var gid = e.target.dataset.gid; |
1085 | }, | 1119 | }, |
1086 | //---------拿出门店分类和门店------------ | 1120 | //---------拿出门店分类和门店------------ |
1087 | - async get_sto(e) { | ||
1088 | - var th = this, dd = null,i=getApp().request; | ||
1089 | - var g_distr_type = this.data.data.distr_type; | ||
1090 | - if (g_distr_type != 0) { | ||
1091 | - dd = { | ||
1092 | - store_id: o.stoid, | ||
1093 | - distr_type: g_distr_type, | ||
1094 | - isstop: 0, | ||
1095 | - pageSize: 300 | 1121 | + get_sto(e) { |
1122 | + var th=this; | ||
1123 | + var timer_get=setInterval(function () { | ||
1124 | + if(th.data.is_get_local_ok==0) return false; | ||
1125 | + var dd = null,i=getApp().request; | ||
1126 | + var g_distr_type = th.data.data.distr_type; | ||
1127 | + if (g_distr_type != 0) { | ||
1128 | + dd = { | ||
1129 | + store_id: o.stoid, | ||
1130 | + distr_type: g_distr_type, | ||
1131 | + isstop: 0, | ||
1132 | + pageSize: 300 | ||
1133 | + } | ||
1134 | + } else { | ||
1135 | + dd = { | ||
1136 | + store_id: o.stoid, | ||
1137 | + isstop: 0, | ||
1138 | + pageSize: 300 | ||
1139 | + } | ||
1096 | } | 1140 | } |
1097 | - } else { | ||
1098 | - dd = { | ||
1099 | - store_id: o.stoid, | ||
1100 | - isstop: 0, | ||
1101 | - pageSize: 300 | 1141 | + //如果有距离的话 |
1142 | + if(th.data.lat!=null){ | ||
1143 | + dd.lat=th.data.lat; | ||
1144 | + dd.lon=th.data.lon; | ||
1102 | } | 1145 | } |
1103 | - } | ||
1104 | - //----------获取门店---------------- | ||
1105 | - await getApp().request.promiseGet("/api/weshop/pickup/list", { | ||
1106 | - data: dd, | ||
1107 | - }).then(res => { | ||
1108 | - var e = res; | ||
1109 | - if (e.data.code == 0) { | ||
1110 | - //单总量超出5个的时候 | ||
1111 | - if (e.data.data.total > 5) { | ||
1112 | - i.get("/api/weshop/storagecategory/page", { | ||
1113 | - data: { | ||
1114 | - store_id: o.stoid, | ||
1115 | - is_show: 1, | ||
1116 | - pageSize: 300 | ||
1117 | - }, | ||
1118 | - success: function(ee) { | ||
1119 | - if (ee.data.code == 0) { | ||
1120 | - if (ee.data.data.pageData.length > 0) { | ||
1121 | - var sto_cate = ee.data.data.pageData; | ||
1122 | - var sto_arr = e.data.data.pageData; | ||
1123 | - var newarr = new Array(); | ||
1124 | - var qita = new Array(); | ||
1125 | - //----要进行门店分组-------- | ||
1126 | - for (var i = 0; i < sto_arr.length; i++) { | ||
1127 | - //找一下这个门店有没有在分类数组内 | ||
1128 | - var find2 = 0, | ||
1129 | - find2name = ""; | ||
1130 | - for (var m = 0; m < sto_cate.length; m++) { | ||
1131 | - if (sto_arr[i].category_id == sto_cate[m].cat_id) { | ||
1132 | - find2 = sto_cate[m].cat_id; | ||
1133 | - find2name = sto_cate[m].cat_name; | ||
1134 | - break; | ||
1135 | - } | 1146 | + clearInterval(timer_get); |
1147 | + //----------获取门店---------------- | ||
1148 | + getApp().request.promiseGet("/api/weshop/pickup/list", { | ||
1149 | + data: dd, | ||
1150 | + }).then(res => { | ||
1151 | + var e = res; | ||
1152 | + if (e.data.code == 0) { | ||
1153 | + //-- 如果有默认选择门店的时候,要把默认门店放在第一位 -- | ||
1154 | + if(th.data.def_pick_store) { | ||
1155 | + for(var k=0;k<e.data.data.pageData.length;k++){ | ||
1156 | + if(e.data.data.pageData[k].pickup_id==th.data.def_pick_store.pickup_id){ | ||
1157 | + e.data.data.pageData.splice(k, 1); //删除 | ||
1158 | + break; | ||
1159 | + } | ||
1160 | + } | ||
1161 | + e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 | ||
1162 | + } | ||
1163 | + | ||
1164 | + //单总量超出5个的时候 | ||
1165 | + if (e.data.data.total > 5) { | ||
1166 | + i.get("/api/weshop/storagecategory/page", { | ||
1167 | + data: { | ||
1168 | + store_id: o.stoid, | ||
1169 | + is_show: 1, | ||
1170 | + pageSize: 300 | ||
1171 | + }, | ||
1172 | + success: function(ee) { | ||
1173 | + if (ee.data.code == 0) { | ||
1174 | + if (ee.data.data.pageData.length > 0) { | ||
1175 | + var def_arr=new Array(); | ||
1176 | + var ishas=0; | ||
1177 | + //-- 开始就看5个门店 -- | ||
1178 | + for(var k=0;k<5;k++){ | ||
1179 | + if(k==e.data.data.pageData.length) break; | ||
1180 | + def_arr.push(e.data.data.pageData[k]); | ||
1136 | } | 1181 | } |
1137 | 1182 | ||
1138 | - if (newarr.length > 0) { | ||
1139 | - var find = 0; | ||
1140 | - //如果有找到,那门店就在这个分组内,否则,分类就要排在其他 | ||
1141 | - if (find2 != 0) { | ||
1142 | - for (var ii = 0; ii < newarr.length; ii++) { | ||
1143 | - if (sto_arr[i].category_id == newarr[ii].cat_id) { | ||
1144 | - newarr[ii].s_arr.push(sto_arr[i]); | ||
1145 | - find = 1; | ||
1146 | - break; | 1183 | + th.setData({def_pickpu_list:def_arr,pickpu_list:ee.data.data.pageData}); |
1184 | + var sto_cate = ee.data.data.pageData; | ||
1185 | + var sto_arr = e.data.data.pageData; | ||
1186 | + var newarr = new Array(); | ||
1187 | + var qita = new Array(); | ||
1188 | + | ||
1189 | + //----要进行门店分组-------- | ||
1190 | + for (var i = 0; i < sto_arr.length; i++) { | ||
1191 | + //找一下这个门店有没有在分类数组内 | ||
1192 | + var find2 = 0, | ||
1193 | + find2name = ""; | ||
1194 | + for (var m = 0; m < sto_cate.length; m++) { | ||
1195 | + if (sto_arr[i].category_id == sto_cate[m].cat_id) { | ||
1196 | + find2 = sto_cate[m].cat_id; | ||
1197 | + find2name = sto_cate[m].cat_name; | ||
1198 | + break; | ||
1199 | + } | ||
1200 | + } | ||
1201 | + | ||
1202 | + if (newarr.length > 0) { | ||
1203 | + var find = 0; | ||
1204 | + //如果有找到,那门店就在这个分组内,否则,分类就要排在其他 | ||
1205 | + if (find2 != 0) { | ||
1206 | + for (var ii = 0; ii < newarr.length; ii++) { | ||
1207 | + if (sto_arr[i].category_id == newarr[ii].cat_id) { | ||
1208 | + newarr[ii].s_arr.push(sto_arr[i]); | ||
1209 | + find = 1; | ||
1210 | + break; | ||
1211 | + } | ||
1147 | } | 1212 | } |
1213 | + if (find == 0) { | ||
1214 | + var arr0 = new Array(); | ||
1215 | + arr0.push(sto_arr[i]); | ||
1216 | + var item = { | ||
1217 | + cat_id: find2, | ||
1218 | + name: find2name, | ||
1219 | + s_arr: arr0 | ||
1220 | + }; | ||
1221 | + newarr.push(item); | ||
1222 | + } | ||
1223 | + } else { | ||
1224 | + qita.push(sto_arr[i]); | ||
1148 | } | 1225 | } |
1149 | - if (find == 0) { | 1226 | + } else { |
1227 | + //如果有找到,那门店就在这个分组内,否则,分类就要排在其他 | ||
1228 | + if (find2 != 0) { | ||
1150 | var arr0 = new Array(); | 1229 | var arr0 = new Array(); |
1151 | arr0.push(sto_arr[i]); | 1230 | arr0.push(sto_arr[i]); |
1152 | var item = { | 1231 | var item = { |
@@ -1155,63 +1234,51 @@ Page({ | @@ -1155,63 +1234,51 @@ Page({ | ||
1155 | s_arr: arr0 | 1234 | s_arr: arr0 |
1156 | }; | 1235 | }; |
1157 | newarr.push(item); | 1236 | newarr.push(item); |
1237 | + } else { | ||
1238 | + qita.push(sto_arr[i]); | ||
1158 | } | 1239 | } |
1159 | - } else { | ||
1160 | - qita.push(sto_arr[i]); | ||
1161 | - } | ||
1162 | - } else { | ||
1163 | - //如果有找到,那门店就在这个分组内,否则,分类就要排在其他 | ||
1164 | - if (find2 != 0) { | ||
1165 | - var arr0 = new Array(); | ||
1166 | - arr0.push(sto_arr[i]); | ||
1167 | - var item = { | ||
1168 | - cat_id: find2, | ||
1169 | - name: find2name, | ||
1170 | - s_arr: arr0 | ||
1171 | - }; | ||
1172 | - newarr.push(item); | ||
1173 | - } else { | ||
1174 | - qita.push(sto_arr[i]); | ||
1175 | } | 1240 | } |
1176 | } | 1241 | } |
1177 | - } | ||
1178 | 1242 | ||
1179 | - //----安排其他的分类----- | ||
1180 | - if (qita.length > 0) { | ||
1181 | - var item = { | ||
1182 | - cat_id: -1, | ||
1183 | - name: "其他", | ||
1184 | - s_arr: qita | ||
1185 | - }; | ||
1186 | - newarr.push(item); | ||
1187 | - } | ||
1188 | - th.setData({ | ||
1189 | - is_show_sto_cat: 1, | ||
1190 | - all_sto: newarr | ||
1191 | - }); | 1243 | + //----安排其他的分类----- |
1244 | + if (qita.length > 0) { | ||
1245 | + var item = { | ||
1246 | + cat_id: -1, | ||
1247 | + name: "其他", | ||
1248 | + s_arr: qita | ||
1249 | + }; | ||
1250 | + newarr.push(item); | ||
1251 | + } | ||
1252 | + th.setData({ | ||
1253 | + is_show_sto_cat: 1, | ||
1254 | + all_sto: newarr | ||
1255 | + }); | ||
1192 | 1256 | ||
1257 | + } else { | ||
1258 | + th.setData({ | ||
1259 | + is_show_sto_cat: -1, | ||
1260 | + only_pk: e.data.data.pageData | ||
1261 | + }); | ||
1262 | + } | ||
1193 | } else { | 1263 | } else { |
1194 | th.setData({ | 1264 | th.setData({ |
1195 | - is_show_sto_cat: 0, | 1265 | + is_show_sto_cat: -1, |
1196 | only_pk: e.data.data.pageData | 1266 | only_pk: e.data.data.pageData |
1197 | }); | 1267 | }); |
1198 | } | 1268 | } |
1199 | - } else { | ||
1200 | - th.setData({ | ||
1201 | - is_show_sto_cat: 0, | ||
1202 | - only_pk: e.data.data.pageData | ||
1203 | - }); | ||
1204 | } | 1269 | } |
1205 | - } | ||
1206 | - }); | ||
1207 | - } else { | ||
1208 | - th.setData({ | ||
1209 | - is_show_sto_cat: 0, | ||
1210 | - only_pk: e.data.data.pageData | ||
1211 | - }); | 1270 | + }); |
1271 | + } else { | ||
1272 | + th.setData({ | ||
1273 | + is_show_sto_cat: 0, | ||
1274 | + only_pk: e.data.data.pageData | ||
1275 | + }); | ||
1276 | + } | ||
1212 | } | 1277 | } |
1213 | - } | ||
1214 | - }) | 1278 | + }) |
1279 | + },200) | ||
1280 | + | ||
1281 | + | ||
1215 | }, | 1282 | }, |
1216 | 1283 | ||
1217 | //----------取货门店被点击的效果------ | 1284 | //----------取货门店被点击的效果------ |
@@ -2571,7 +2638,7 @@ Page({ | @@ -2571,7 +2638,7 @@ Page({ | ||
2571 | success: function (res) { | 2638 | success: function (res) { |
2572 | //res.path是网络图片的本地地址 | 2639 | //res.path是网络图片的本地地址 |
2573 | ee.data.share_head = res.path; | 2640 | ee.data.share_head = res.path; |
2574 | - tt(func);; | 2641 | + tt(func); |
2575 | }, | 2642 | }, |
2576 | fail: function (res) { | 2643 | fail: function (res) { |
2577 | ee.data.share_head = "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 | 2644 | ee.data.share_head = "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 |
@@ -2660,7 +2727,9 @@ Page({ | @@ -2660,7 +2727,9 @@ Page({ | ||
2660 | }, | 2727 | }, |
2661 | //关闭选择门店 | 2728 | //关闭选择门店 |
2662 | close_popup:function(){ | 2729 | close_popup:function(){ |
2663 | - this.setData({ store: 0, choice_sort_store: 0,sort_store:0}) | 2730 | + this.setData({ |
2731 | + store: 0, choice_sort_store: 0,sort_store:0} | ||
2732 | + ) | ||
2664 | }, | 2733 | }, |
2665 | //选择更多门店 | 2734 | //选择更多门店 |
2666 | more_store:function(){ | 2735 | more_store:function(){ |
@@ -2673,8 +2742,58 @@ close_popup:function(){ | @@ -2673,8 +2742,58 @@ close_popup:function(){ | ||
2673 | returns:function(){ | 2742 | returns:function(){ |
2674 | this.setData({ sort_store: 0,choice_sort_store:0}); | 2743 | this.setData({ sort_store: 0,choice_sort_store:0}); |
2675 | }, | 2744 | }, |
2676 | - // 选择分类门店 | ||
2677 | - choice_sort_store:function(){ | ||
2678 | - this.setData({ sort_store: 0, choice_sort_store:1 }); | ||
2679 | - } | 2745 | + //---选择分类门店--- |
2746 | + choice_sort_store:function(e){ | ||
2747 | + var index=e.currentTarget.dataset.index; | ||
2748 | + var item = this.data.all_sto[index]; | ||
2749 | + this.setData({ sort_store: 0, choice_sort_store:1, sec_sto: item,sec_pick_index:0 }); | ||
2750 | + }, | ||
2751 | + | ||
2752 | + //---点击二级之后的选择--- | ||
2753 | + choose_for_store:function (e) { | ||
2754 | + var index_c=e.currentTarget.dataset.ind; | ||
2755 | + this.setData({sec_pick_index:index_c,fir_pick_index:0}) | ||
2756 | + }, | ||
2757 | + | ||
2758 | + choose_for_store_fir:function (e) { | ||
2759 | + var index_c=e.currentTarget.dataset.ind; | ||
2760 | + this.setData({fir_pick_index:index_c}) | ||
2761 | + }, | ||
2762 | + | ||
2763 | + //确定def_pick为选择的门店 | ||
2764 | + sure_pick:function () { | ||
2765 | + var th=this; var item=null; | ||
2766 | + if(th.data.choice_sort_store==0 ){ | ||
2767 | + var index=th.data.fir_pick_index; | ||
2768 | + if(th.data.is_show_sto_cat==1){ | ||
2769 | + item=th.data.def_pickpu_list[index]; | ||
2770 | + }else{ | ||
2771 | + item=th.data.only_pk[index]; //当没有门店分类的时候 | ||
2772 | + } | ||
2773 | + }else{ | ||
2774 | + var index=th.data.sec_pick_index; | ||
2775 | + item=th.data.sec_sto.s_arr[index]; | ||
2776 | + } | ||
2777 | + th.setData({def_pick_store:item,sto_sele_name:item.pickup_name, | ||
2778 | + sto_sele_id:item.pickup_id,sto_sele_distr:item.distr_type,store:0,choice_sort_store:0}); | ||
2779 | + }, | ||
2780 | + | ||
2781 | + //把选择的门店设置成默认的门店def_pick | ||
2782 | + set_def_pick:function () { | ||
2783 | + var th=this; var item=null; | ||
2784 | + if(th.data.choice_sort_store==0 ){ | ||
2785 | + var index=th.data.fir_pick_index; | ||
2786 | + if(th.data.is_show_sto_cat==1){ | ||
2787 | + item=th.data.def_pickpu_list[index]; | ||
2788 | + }else{ | ||
2789 | + item=th.data.only_pk[index]; //当没有门店分类的时候 | ||
2790 | + } | ||
2791 | + }else{ | ||
2792 | + var index=th.data.sec_pick_index; | ||
2793 | + item=th.data.sec_sto.s_arr[index]; | ||
2794 | + } | ||
2795 | + | ||
2796 | + } | ||
2797 | + | ||
2798 | + | ||
2680 | }); | 2799 | }); |
2681 | \ No newline at end of file | 2800 | \ No newline at end of file |
pages/goods/goodsInfo/goodsInfo.wxml
@@ -300,30 +300,31 @@ | @@ -300,30 +300,31 @@ | ||
300 | </view> | 300 | </view> |
301 | </block> | 301 | </block> |
302 | 302 | ||
303 | - <!-- 门店收货地址 --> | 303 | + <!-- 门店收货地址 --> |
304 | <view class="xc-address_frame flex-vertical xc-ash" > | 304 | <view class="xc-address_frame flex-vertical xc-ash" > |
305 | <view class="address_frame"> | 305 | <view class="address_frame"> |
306 | <view class="flex-vertical-between "> | 306 | <view class="flex-vertical-between "> |
307 | <view class="flex"> | 307 | <view class="flex"> |
308 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | 308 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
309 | - <view class="fs28"> 选择附近门店</view> | 309 | + <view class="fs28">选择门店</view> |
310 | </view> | 310 | </view> |
311 | <view class="red_bb fs32" bindtap="choice_store"> | 311 | <view class="red_bb fs32" bindtap="choice_store"> |
312 | 更多门店 | 312 | 更多门店 |
313 | <text class="bg_jj"></text> | 313 | <text class="bg_jj"></text> |
314 | </view> | 314 | </view> |
315 | </view> | 315 | </view> |
316 | - <view wx:if="{{new_user==1}}"> | 316 | + |
317 | + <view wx:if="{{def_pick_store}}"> | ||
317 | <view class="flex-space-between address ai_end "> | 318 | <view class="flex-space-between address ai_end "> |
318 | <view> | 319 | <view> |
319 | - <text class="fs32 xc-black3 shop_name"> 泉州开源盛世</text> | ||
320 | - <text class="fs20">暂无库存</text> | 320 | + <text class="fs32 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> |
321 | + <!--<text class="fs20">暂无库存</text>--> | ||
321 | </view> | 322 | </view> |
322 | <view class="distance fs20"> | 323 | <view class="distance fs20"> |
323 | - 距离:3754m | 324 | + 距离:{{filters.toFix(def_pick_store.distance,0)}}m |
324 | </view> | 325 | </view> |
325 | </view> | 326 | </view> |
326 | - <view class="fs20">地址:福建省泉州市鲤城区软件园4栋4层</view> | 327 | + <view class="fs20">地址:{{def_pick_store.fulladdress}}</view> |
327 | </view> | 328 | </view> |
328 | </view> | 329 | </view> |
329 | 330 | ||
@@ -778,18 +779,26 @@ | @@ -778,18 +779,26 @@ | ||
778 | </block> | 779 | </block> |
779 | </view> | 780 | </view> |
780 | <view class="flex-space-between address ai_end xc-width "> | 781 | <view class="flex-space-between address ai_end xc-width "> |
781 | - <view class="flex ai_end"> | ||
782 | - <text class="fs28 xc-black3 shop_name"> 泉州开源盛世</text> | 782 | + |
783 | + <view class="flex ai_end" wx:if="{{def_pick_store}}"> | ||
784 | + <text class="fs28 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | ||
783 | <view class="distance fs20 xc-ash"> | 785 | <view class="distance fs20 xc-ash"> |
784 | - 距离:3754m | 786 | + 距离:{{filters.toFix(def_pick_store.distance,0)}}m |
785 | </view> | 787 | </view> |
786 | </view> | 788 | </view> |
787 | - <view class="red-co fs28" bindtap="choice_store"> | 789 | + |
790 | + <!-- 没有门店的时候 --> | ||
791 | + <view class="flex" bindtap="choice_store" wx:else> | ||
792 | + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | ||
793 | + <view class="fs28">选择门店</view> | ||
794 | + </view> | ||
795 | + | ||
796 | + <view class="red-co fs28" bindtap="choice_store"> | ||
788 | 更多门店 | 797 | 更多门店 |
789 | <text class="right-arrow"></text> | 798 | <text class="right-arrow"></text> |
790 | - </view> | 799 | + </view> |
791 | </view> | 800 | </view> |
792 | - <view class="fs20 xc-ash xc-distance-top">地址:福建省泉州市鲤城区软件园4栋4层</view> | 801 | + <view class="fs20 xc-ash xc-distance-top">地址:{{def_pick_store.fulladdress}}</view> |
793 | </view> | 802 | </view> |
794 | <!----商品的属性项目----> | 803 | <!----商品的属性项目----> |
795 | <view class="xc-goods-attribute"> | 804 | <view class="xc-goods-attribute"> |
@@ -1039,7 +1048,7 @@ | @@ -1039,7 +1048,7 @@ | ||
1039 | </view> | 1048 | </view> |
1040 | </view> | 1049 | </view> |
1041 | 1050 | ||
1042 | -<!-- 选择门店的弹框 --> | 1051 | +<!-- 选择门店的弹框,1.1版最新的 --> |
1043 | <block wx:if="{{store==1}}"> | 1052 | <block wx:if="{{store==1}}"> |
1044 | <view class="mongolia-layer" bindtap="close_popup"></view> | 1053 | <view class="mongolia-layer" bindtap="close_popup"></view> |
1045 | <view class="popup-frame"> | 1054 | <view class="popup-frame"> |
@@ -1052,52 +1061,105 @@ | @@ -1052,52 +1061,105 @@ | ||
1052 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 1061 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
1053 | </view> | 1062 | </view> |
1054 | <view class="felx choose_more" bindtap="more_store"> | 1063 | <view class="felx choose_more" bindtap="more_store"> |
1055 | - <text class="fs22 red-co">{{choice_sort_store==0?'选择更多门店':'返回'}}</text> | 1064 | + <text class="fs22 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'选择更多门店':'返回'}}</text> |
1056 | <view class="bg_rights"></view> | 1065 | <view class="bg_rights"></view> |
1057 | </view> | 1066 | </view> |
1058 | </view> | 1067 | </view> |
1059 | </view> | 1068 | </view> |
1060 | - <!-- 门店列表 --> | ||
1061 | - <view class="store-list"> | ||
1062 | - <view class="store_choose flex"> | ||
1063 | - <view class="store flex-vertical"> | ||
1064 | - <block wx:if="{{index==1}}"> | 1069 | + <!-- 门店列表,最外层的门店列表,一开始 --> |
1070 | + <view class="store-list"> | ||
1071 | + <!--如果还没有点击更多门店的时候 --> | ||
1072 | + <block wx:if="{{choice_sort_store==0}}"> | ||
1073 | + <!-- 需要for循环 --> | ||
1074 | + <block wx:if="is_show_sto_cat==1"> | ||
1075 | + <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
1076 | + <view class="store flex-vertical"> | ||
1077 | + <!-- 需要点击事件 --> | ||
1078 | + <block wx:if="{{index==fir_pick_index}}"> | ||
1065 | <view class="circle white xc-hook fs20 red-b">Г</view> | 1079 | <view class="circle white xc-hook fs20 red-b">Г</view> |
1066 | </block> | 1080 | </block> |
1067 | - <block wx:else> | 1081 | + <block wx:else> |
1068 | <view class="circle xc-hooks"></view> | 1082 | <view class="circle xc-hooks"></view> |
1069 | </block> | 1083 | </block> |
1070 | - | ||
1071 | - <view class="address-frame xc-ash"> | ||
1072 | - <view class="flex-vertical-between "> | ||
1073 | - <view class="flex xc-ash"> | ||
1074 | - <view class="fs28 xc-black3 address_name">开源盛世广场店</view> | ||
1075 | - | 1084 | + <view class="address-frame xc-ash"> |
1085 | + <view class="flex-vertical-between "> | ||
1086 | + <view class="flex xc-ash"> | ||
1087 | + <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1076 | </view> | 1088 | </view> |
1077 | <view> | 1089 | <view> |
1078 | - <view class="distance fs20 address-val">距离:3754m</view> | 1090 | + <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view> |
1079 | </view> | 1091 | </view> |
1080 | - </view> | ||
1081 | - <view class="fs20">地址:福建省泉州市鲤城区软件园4栋4层</view> | ||
1082 | - </view> | ||
1083 | - </view> | ||
1084 | - | ||
1085 | - </view> | ||
1086 | - | ||
1087 | - </view> | ||
1088 | - <!-- 门店列表底部 --> | ||
1089 | - <view class="store-bottom-frame"> | ||
1090 | - <view class="store-bottom flex-vertical-between"> | ||
1091 | - <view class="determine red-b fs28 white t-c"> | ||
1092 | - 确定 | ||
1093 | - </view> | ||
1094 | - <view class="default t-c fs28"> | ||
1095 | - 设为默认 | ||
1096 | - </view> | ||
1097 | - </view> | ||
1098 | - </view> | 1092 | + </view> |
1093 | + <view class="fs20">地址:{{item.fulladdress}}</view> | ||
1094 | + </view> | ||
1095 | + </view> | ||
1096 | + </view> | ||
1097 | + </block> | ||
1098 | + <block wx:else> | ||
1099 | + <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}"> | ||
1100 | + <view class="store flex-vertical"> | ||
1101 | + <!-- 需要点击事件 --> | ||
1102 | + <block wx:if="{{index==fir_pick_index}}" > | ||
1103 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
1104 | + </block> | ||
1105 | + <block wx:else> | ||
1106 | + <view class="circle xc-hooks"></view> | ||
1107 | + </block> | ||
1108 | + | ||
1109 | + <view class="address-frame xc-ash"> | ||
1110 | + <view class="flex-vertical-between "> | ||
1111 | + <view class="flex xc-ash"> | ||
1112 | + <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1113 | + </view> | ||
1114 | + <view> | ||
1115 | + <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view> | ||
1116 | + </view> | ||
1117 | + </view> | ||
1118 | + <view class="fs20">地址:{{item.fulladdress}}</view> | ||
1119 | + </view> | ||
1120 | + </view> | ||
1121 | + </view> | ||
1122 | + </block> | ||
1123 | + </block> | ||
1124 | + <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店 --> | ||
1125 | + <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store"> | ||
1126 | + <view class="store flex-vertical"> | ||
1127 | + <!-- 需要点击事件 --> | ||
1128 | + <block wx:if="{{index==sec_pick_index}}"> | ||
1129 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
1130 | + </block> | ||
1131 | + <block wx:else> | ||
1132 | + <view class="circle xc-hooks"></view> | ||
1133 | + </block> | ||
1134 | + | ||
1135 | + <view class="address-frame xc-ash"> | ||
1136 | + <view class="flex-vertical-between "> | ||
1137 | + <view class="flex xc-ash"> | ||
1138 | + <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | ||
1139 | + </view> | ||
1140 | + <view> | ||
1141 | + <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view> | ||
1142 | + </view> | ||
1143 | + </view> | ||
1144 | + <view class="fs20">地址:{{item.fulladdress}}</view> | ||
1145 | + </view> | ||
1146 | + </view> | ||
1147 | + </view> | ||
1148 | + </block> | ||
1149 | + | ||
1150 | + </view> | ||
1151 | + | ||
1152 | + <!-- 门店列表底部 --> | ||
1153 | + <view class="store-bottom-frame"> | ||
1154 | + <view class="store-bottom flex-vertical-between"> | ||
1155 | + <view class="determine red-b fs28 white t-c" bindtap="sure_pick">确定</view> | ||
1156 | + <view class="default t-c fs28" bindtap="set_def_pick">设为默认</view> | ||
1157 | + </view> | ||
1158 | + </view> | ||
1099 | 1159 | ||
1100 | - </block> | 1160 | + </block> |
1161 | + | ||
1162 | + | ||
1101 | <block wx:else> | 1163 | <block wx:else> |
1102 | <view class="popup-top flex-space-between"> | 1164 | <view class="popup-top flex-space-between"> |
1103 | <text class="fs32 nearby_store">门店分类选择</text> | 1165 | <text class="fs32 nearby_store">门店分类选择</text> |
@@ -1112,15 +1174,13 @@ | @@ -1112,15 +1174,13 @@ | ||
1112 | </view> | 1174 | </view> |
1113 | <view class="sort_store_list"> | 1175 | <view class="sort_store_list"> |
1114 | 1176 | ||
1115 | - <view class="sort-store-frame"> | ||
1116 | - <view class="sort-store flex-vertical-between" bindtap="choice_sort_store"> | ||
1117 | - <view class="fs28"> | ||
1118 | - 泉州开源广场 | ||
1119 | - </view> | ||
1120 | - <view class="black_rights-frame"> | ||
1121 | - <view class="black_rights"></view> | ||
1122 | - </view> | ||
1123 | - </view> | 1177 | + <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store"> |
1178 | + <view class="sort-store flex-vertical-between" > | ||
1179 | + <view class="fs28">{{item.name}}</view> | ||
1180 | + <view class="black_rights-frame"> | ||
1181 | + <view class="black_rights"></view> | ||
1182 | + </view> | ||
1183 | + </view> | ||
1124 | </view> | 1184 | </view> |
1125 | 1185 | ||
1126 | </view> | 1186 | </view> |