1 participants
-
Status changed to merged
-
mentioned in commit 142b2a595be76bd205d71b3e6ef35d0a1b8ba769
Showing
10 changed files
app.json
| 1 | { | 1 | { |
| 2 | "pages": [ | 2 | "pages": [ |
| 3 | "pages/index/index/index", | 3 | "pages/index/index/index", |
| 4 | - "pages/justTest/justTest", | ||
| 5 | "pages/goods/categoryList/categoryList", | 4 | "pages/goods/categoryList/categoryList", |
| 6 | "pages/cart/cart/cart", | 5 | "pages/cart/cart/cart", |
| 7 | "pages/cart/cart2/cart2", | 6 | "pages/cart/cart2/cart2", |
| @@ -86,11 +85,18 @@ | @@ -86,11 +85,18 @@ | ||
| 86 | "pages/video/index", | 85 | "pages/video/index", |
| 87 | "pages/template/index", | 86 | "pages/template/index", |
| 88 | "pages/store/index", | 87 | "pages/store/index", |
| 89 | - "pages/user/choice_guide/choice_guide" | 88 | + "pages/user/choice_guide/choice_guide", |
| 89 | + "pages/cart/cart2_inte/cart2_inte", | ||
| 90 | + "pages/giftpack/festival/festival", | ||
| 91 | + "pages/team/team_more/team_more", | ||
| 92 | + "pages/user/collect_list/collect_list", | ||
| 93 | + "pages/user/deposit/deposit", | ||
| 94 | + "pages/user/deposit/prepaid/msg/msg", | ||
| 95 | + "pages/user/deposit/prepaid/prepaid" | ||
| 90 | ], | 96 | ], |
| 91 | "plugins": { | 97 | "plugins": { |
| 92 | "live-player-plugin": { | 98 | "live-player-plugin": { |
| 93 | - "version": "1.1.1", | 99 | + "version": "1.2.1", |
| 94 | "provider": "wx2b03c6e691cd7370" | 100 | "provider": "wx2b03c6e691cd7370" |
| 95 | } | 101 | } |
| 96 | }, | 102 | }, |
components/diy_shopname/diy_shopname.wxml
| @@ -3,18 +3,20 @@ | @@ -3,18 +3,20 @@ | ||
| 3 | <view class="big"> | 3 | <view class="big"> |
| 4 | 4 | ||
| 5 | <view class="big_picture_border"> | 5 | <view class="big_picture_border"> |
| 6 | - <image class="big_picture" src='{{object.srcimg}}' binderror="berror" data-err="object.srcimg"></image> | 6 | + <image mode="widthFix" style="display: block;" class="big_picture" src='{{object.srcimg}}' binderror="berror" data-err="object.srcimg"></image> |
| 7 | </view> | 7 | </view> |
| 8 | <block wx:if="{{object.style==1}}"> | 8 | <block wx:if="{{object.style==1}}"> |
| 9 | 9 | ||
| 10 | - <view class="big_border"> | 10 | + <view style="position: relative; height: 150rpx;"> |
| 11 | + <view class="big_border" > | ||
| 11 | <view class="circle"> | 12 | <view class="circle"> |
| 12 | <view class="border"> | 13 | <view class="border"> |
| 13 | - <image class="wxd_ww" src='{{sto}}' bindtap="go_user"></image> | 14 | + <image class="wxd_ww" src='{{sto}}' bindtap="go_user"></image> |
| 14 | </view> | 15 | </view> |
| 15 | </view> | 16 | </view> |
| 16 | <view class="font">{{store_name}}</view> | 17 | <view class="font">{{store_name}}</view> |
| 17 | </view> | 18 | </view> |
| 19 | + </view> | ||
| 18 | 20 | ||
| 19 | <view class="all_view"> | 21 | <view class="all_view"> |
| 20 | <view class="v_item" bindtap="go_all_wares"> | 22 | <view class="v_item" bindtap="go_all_wares"> |
| @@ -36,8 +38,7 @@ | @@ -36,8 +38,7 @@ | ||
| 36 | </view> | 38 | </view> |
| 37 | </block> | 39 | </block> |
| 38 | 40 | ||
| 39 | - | ||
| 40 | - <block wx:else="{{object.style==2}}"> | 41 | + <block wx:if="{{object.style==2}}"> |
| 41 | <view class="big_border_two"> | 42 | <view class="big_border_two"> |
| 42 | <view class="circle_tow"> | 43 | <view class="circle_tow"> |
| 43 | <view class="border"> | 44 | <view class="border"> |
| @@ -48,35 +49,38 @@ | @@ -48,35 +49,38 @@ | ||
| 48 | <view class="fonts">{{store_name}}</view> | 49 | <view class="fonts">{{store_name}}</view> |
| 49 | </view> | 50 | </view> |
| 50 | </view> | 51 | </view> |
| 51 | - <view class="base_font"> | ||
| 52 | - <view class="arrange"> | ||
| 53 | - <view class="base_font_one"> | ||
| 54 | - <navigator url="/pages/goods/goodsList/goodsList" class="navi"> | ||
| 55 | - <view>{{total}}</view> | ||
| 56 | - <view>全部商品</view> | ||
| 57 | - </navigator> | ||
| 58 | - </view> | ||
| 59 | - | ||
| 60 | - <view class="base_font_one"> | ||
| 61 | - <view class="shuxian">|</view> | ||
| 62 | - <navigator url="/pages/goods/goodsList/goodsList?is_new=1" class="navi"> | ||
| 63 | - <view>{{new_total}}</view> | ||
| 64 | - <view>上新商品</view> | ||
| 65 | - </navigator> | ||
| 66 | - </view> | ||
| 67 | - | ||
| 68 | - <view class="base_font_one" bindtap="go_user"> | ||
| 69 | - <view class="shuxian">|</view> | ||
| 70 | - <view class="navi"> | ||
| 71 | - <view > | ||
| 72 | - <image class="user_pictrue_two" src='{{imghost}}/miniapp/images/numb.png'></image> | ||
| 73 | - </view> | ||
| 74 | - <view>个人中心</view> | ||
| 75 | - </view> | ||
| 76 | - </view> | ||
| 77 | - </view> | ||
| 78 | - </view> | ||
| 79 | </block> | 52 | </block> |
| 80 | </view> | 53 | </view> |
| 54 | + | ||
| 55 | + <block wx:if="{{object.style==2}}"> | ||
| 56 | + <view class="base_font"> | ||
| 57 | + <view class="arrange"> | ||
| 58 | + <view class="base_font_one"> | ||
| 59 | + <navigator url="/pages/goods/goodsList/goodsList" class="navi"> | ||
| 60 | + <view>{{total}}</view> | ||
| 61 | + <view>全部商品</view> | ||
| 62 | + </navigator> | ||
| 63 | + </view> | ||
| 64 | + | ||
| 65 | + <view class="base_font_one"> | ||
| 66 | + <view class="shuxian">|</view> | ||
| 67 | + <navigator url="/pages/goods/goodsList/goodsList?is_new=1" class="navi"> | ||
| 68 | + <view>{{new_total}}</view> | ||
| 69 | + <view>上新商品</view> | ||
| 70 | + </navigator> | ||
| 71 | + </view> | ||
| 72 | + | ||
| 73 | + <view class="base_font_one" bindtap="go_user"> | ||
| 74 | + <view class="shuxian">|</view> | ||
| 75 | + <view class="navi"> | ||
| 76 | + <view > | ||
| 77 | + <image class="user_pictrue_two" src='{{imghost}}/miniapp/images/numb.png'></image> | ||
| 78 | + </view> | ||
| 79 | + <view>个人中心</view> | ||
| 80 | + </view> | ||
| 81 | + </view> | ||
| 82 | + </view> | ||
| 83 | + </view> | ||
| 84 | + </block> | ||
| 81 | </view> | 85 | </view> |
| 82 | 86 |
components/diy_shopname/diy_shopname.wxss
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | text-align:center; | 4 | text-align:center; |
| 5 | margin:0 auto; | 5 | margin:0 auto; |
| 6 | position: relative; | 6 | position: relative; |
| 7 | - height: 500rpx; | 7 | + /* height: 500rpx; */ |
| 8 | } | 8 | } |
| 9 | 9 | ||
| 10 | .s1_gk_a1{ | 10 | .s1_gk_a1{ |
| @@ -15,11 +15,9 @@ | @@ -15,11 +15,9 @@ | ||
| 15 | 15 | ||
| 16 | /* 圆形小图片 */ | 16 | /* 圆形小图片 */ |
| 17 | .wxd_ww { | 17 | .wxd_ww { |
| 18 | - width: 126rpx; | ||
| 19 | - height: 126rpx; | 18 | + width: 100%; |
| 19 | + height: 100%; | ||
| 20 | /* justify-content: center; */ | 20 | /* justify-content: center; */ |
| 21 | - margin-top: 20rpx; | ||
| 22 | - margin-left: 6rpx; | ||
| 23 | } | 21 | } |
| 24 | 22 | ||
| 25 | /* 小图片圆边框 */ | 23 | /* 小图片圆边框 */ |
| @@ -43,8 +41,8 @@ | @@ -43,8 +41,8 @@ | ||
| 43 | /* 设置小图片外面的view的宽高 */ | 41 | /* 设置小图片外面的view的宽高 */ |
| 44 | 42 | ||
| 45 | .circle_tow .border { | 43 | .circle_tow .border { |
| 46 | - width: 140rpx; | ||
| 47 | - height: 140rpx; | 44 | + width: 100%; |
| 45 | + height: 100%; | ||
| 48 | } | 46 | } |
| 49 | 47 | ||
| 50 | /* 小图片最大外边框 */ | 48 | /* 小图片最大外边框 */ |
| @@ -52,7 +50,7 @@ | @@ -52,7 +50,7 @@ | ||
| 52 | .big_border { | 50 | .big_border { |
| 53 | width: 192rpx; | 51 | width: 192rpx; |
| 54 | height: 214rpx; | 52 | height: 214rpx; |
| 55 | - position: relative; | 53 | + position: absolute; |
| 56 | top: -82rpx; | 54 | top: -82rpx; |
| 57 | left: 10px; | 55 | left: 10px; |
| 58 | } | 56 | } |
| @@ -69,7 +67,7 @@ | @@ -69,7 +67,7 @@ | ||
| 69 | 67 | ||
| 70 | .big_picture_border { | 68 | .big_picture_border { |
| 71 | width: 100%; | 69 | width: 100%; |
| 72 | - height: 320rpx; | 70 | + /* height: 320rpx; */ |
| 73 | } | 71 | } |
| 74 | 72 | ||
| 75 | 73 | ||
| @@ -140,9 +138,10 @@ left:-116rpx; | @@ -140,9 +138,10 @@ left:-116rpx; | ||
| 140 | .big_border_two { | 138 | .big_border_two { |
| 141 | width: 100%; | 139 | width: 100%; |
| 142 | height: 260rpx; | 140 | height: 260rpx; |
| 143 | - position: relative; | ||
| 144 | - top: -274rpx; | 141 | + position: absolute; |
| 142 | + top: -130rpx; | ||
| 145 | text-align: center; | 143 | text-align: center; |
| 144 | + margin-top: 50%; | ||
| 146 | } | 145 | } |
| 147 | 146 | ||
| 148 | /* 小图片2圆边框 */ | 147 | /* 小图片2圆边框 */ |
| @@ -189,7 +188,6 @@ left:-116rpx; | @@ -189,7 +188,6 @@ left:-116rpx; | ||
| 189 | width: 100%; | 188 | width: 100%; |
| 190 | height: 120rpx; | 189 | height: 120rpx; |
| 191 | position: relative; | 190 | position: relative; |
| 192 | - top: -250rpx; | ||
| 193 | } | 191 | } |
| 194 | /* 使里面的view纵向排列 */ | 192 | /* 使里面的view纵向排列 */ |
| 195 | .arrange{ | 193 | .arrange{ |
| @@ -223,11 +221,11 @@ left:-116rpx; | @@ -223,11 +221,11 @@ left:-116rpx; | ||
| 223 | } | 221 | } |
| 224 | .wai_zwp{ | 222 | .wai_zwp{ |
| 225 | background-color: white; | 223 | background-color: white; |
| 226 | - height: 500rpx; | 224 | + /* height: 500rpx; */ |
| 227 | } | 225 | } |
| 228 | 226 | ||
| 229 | .shopname_title_size{ font-size: 34rpx} | 227 | .shopname_title_size{ font-size: 34rpx} |
| 230 | -.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:90rpx;right: 0 } | 228 | +.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:rpx;right: 0 } |
| 231 | .big .all_view .v_item{width:33%; } | 229 | .big .all_view .v_item{width:33%; } |
| 232 | 230 | ||
| 233 | .big_border_two .title_center{ display: flex; justify-content: center;} | 231 | .big_border_two .title_center{ display: flex; justify-content: center;} |
images/share/miao_share.png
packageA/pages/prom_list/prom_list.js
| @@ -241,20 +241,22 @@ Page({ | @@ -241,20 +241,22 @@ Page({ | ||
| 241 | }else{ | 241 | }else{ |
| 242 | ee.setData({ data: t.data.data, }); | 242 | ee.setData({ data: t.data.data, }); |
| 243 | } | 243 | } |
| 244 | - | ||
| 245 | - /*---获取活动的重表---*/ | ||
| 246 | - //调用接口判断订单优惠， | ||
| 247 | - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => { | ||
| 248 | - if(res.data.code==0){ | ||
| 249 | - var r_data=res.data.data; | ||
| 250 | - th.loop_promise(0,r_data.collocationList,function(){ | ||
| 251 | - ee.setData({ | ||
| 252 | - collocationGoods:r_data.collocationPromList, | ||
| 253 | - collocationList:r_data.collocationList, | ||
| 254 | - }) | ||
| 255 | - }) | ||
| 256 | - } | ||
| 257 | - }) | 244 | + |
| 245 | + if(!ee.data.collocationList){ | ||
| 246 | + /*---获取活动的重表---*/ | ||
| 247 | + //调用接口判断订单优惠， | ||
| 248 | + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => { | ||
| 249 | + if(res.data.code==0){ | ||
| 250 | + var r_data=res.data.data; | ||
| 251 | + th.loop_promise(0,r_data.collocationList,function(){ | ||
| 252 | + ee.setData({ | ||
| 253 | + collocationGoods:r_data.collocationPromList, | ||
| 254 | + collocationList:r_data.collocationList, | ||
| 255 | + }) | ||
| 256 | + }) | ||
| 257 | + } | ||
| 258 | + }) | ||
| 259 | + } | ||
| 258 | 260 | ||
| 259 | //获取统一条形码,普通商品和优惠促销的商品 | 261 | //获取统一条形码,普通商品和优惠促销的商品 |
| 260 | if ( t.data.data.prom_type == 5){ | 262 | if ( t.data.data.prom_type == 5){ |
| @@ -274,7 +276,7 @@ Page({ | @@ -274,7 +276,7 @@ Page({ | ||
| 274 | } | 276 | } |
| 275 | //---通过接口获取门店的线下库存信息-- | 277 | //---通过接口获取门店的线下库存信息-- |
| 276 | return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | 278 | return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ |
| 277 | - data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} | 279 | + data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000} |
| 278 | }) | 280 | }) |
| 279 | }).then(res=>{ | 281 | }).then(res=>{ |
| 280 | if(res.data.code==0 && res.data.data.total>0){ | 282 | if(res.data.code==0 && res.data.data.total>0){ |
| @@ -414,7 +416,7 @@ Page({ | @@ -414,7 +416,7 @@ Page({ | ||
| 414 | var pick=th.get_pick_from_list(th.data.sto_sele_id) | 416 | var pick=th.get_pick_from_list(th.data.sto_sele_id) |
| 415 | //---通过接口获取门店的线下库存信息-- | 417 | //---通过接口获取门店的线下库存信息-- |
| 416 | getApp().request.get("/api/weshop/goods/getWareStorages",{ | 418 | getApp().request.get("/api/weshop/goods/getWareStorages",{ |
| 417 | - data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}, | 419 | + data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000}, |
| 418 | success:function(res){ | 420 | success:function(res){ |
| 419 | if(res.data.code==0){ | 421 | if(res.data.code==0){ |
| 420 | if(res.data.data.pageData.length>0){ | 422 | if(res.data.data.pageData.length>0){ |
| @@ -943,7 +945,7 @@ Page({ | @@ -943,7 +945,7 @@ Page({ | ||
| 943 | } | 945 | } |
| 944 | //---通过接口获取门店的线下库存信息-- | 946 | //---通过接口获取门店的线下库存信息-- |
| 945 | return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | 947 | return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ |
| 946 | - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} | 948 | + data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000} |
| 947 | }) | 949 | }) |
| 948 | }).then(res=>{ | 950 | }).then(res=>{ |
| 949 | if(res.data.code==0){ | 951 | if(res.data.code==0){ |
| @@ -1301,7 +1303,7 @@ Page({ | @@ -1301,7 +1303,7 @@ Page({ | ||
| 1301 | }) | 1303 | }) |
| 1302 | //读取线下的门店库存 | 1304 | //读取线下的门店库存 |
| 1303 | await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | 1305 | await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ |
| 1304 | - data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} | 1306 | + data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000} |
| 1305 | }).then(res=>{ | 1307 | }).then(res=>{ |
| 1306 | if(res.data.code==0 && res.data.data.total>0){ | 1308 | if(res.data.code==0 && res.data.data.total>0){ |
| 1307 | plist=res.data.data.pageData[0]; | 1309 | plist=res.data.data.pageData[0]; |
pages/cart/cart2/cart2.js
| @@ -668,7 +668,10 @@ Page({ | @@ -668,7 +668,10 @@ Page({ | ||
| 668 | th.setData({collocation_goods:gg.collocation_goods}); | 668 | th.setData({collocation_goods:gg.collocation_goods}); |
| 669 | 669 | ||
| 670 | var cart_arr=new Array(); | 670 | var cart_arr=new Array(); |
| 671 | - var narr=gg.collocation_goods; | 671 | + //var narr=gg.collocation_goods; |
| 672 | + //修改成深拷贝，确保返回是数据正确 | ||
| 673 | + var narr=JSON.parse(JSON.stringify(gg.collocation_goods)); | ||
| 674 | + | ||
| 672 | narr.push(t.data.data); | 675 | narr.push(t.data.data); |
| 673 | var ie = { | 676 | var ie = { |
| 674 | pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t, | 677 | pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t, |
| @@ -2170,7 +2173,7 @@ Page({ | @@ -2170,7 +2173,7 @@ Page({ | ||
| 2170 | }) | 2173 | }) |
| 2171 | //读取线下的门店库存 | 2174 | //读取线下的门店库存 |
| 2172 | await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | 2175 | await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ |
| 2173 | - data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} | 2176 | + data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000} |
| 2174 | }).then(res=>{ | 2177 | }).then(res=>{ |
| 2175 | if(res.data.code==0){ | 2178 | if(res.data.code==0){ |
| 2176 | plist=res.data.data.pageData[0]; | 2179 | plist=res.data.data.pageData[0]; |
| @@ -2845,8 +2848,10 @@ Page({ | @@ -2845,8 +2848,10 @@ Page({ | ||
| 2845 | //getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () { | 2848 | //getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () { |
| 2846 | //var arr=th.data.order_prom_list_cart; | 2849 | //var arr=th.data.order_prom_list_cart; |
| 2847 | var arr=order_prom_list_cart; | 2850 | var arr=order_prom_list_cart; |
| 2851 | + if(!arr) arr=[]; | ||
| 2848 | //如果系统有限制使用优惠券 | 2852 | //如果系统有限制使用优惠券 |
| 2849 | if(th.data.is_close_quan) return false; | 2853 | if(th.data.is_close_quan) return false; |
| 2854 | + | ||
| 2850 | //------------开始计算使用优惠券相关------------ | 2855 | //------------开始计算使用优惠券相关------------ |
| 2851 | for(var ind in arr){ | 2856 | for(var ind in arr){ |
| 2852 | var ep=arr[ind]; | 2857 | var ep=arr[ind]; |