1 participants
-
Status changed to merged
-
mentioned in commit e1d2784b35d6d1580bacd09bb38a722ee06ddf81
-
2. 会员首页的脚本错误纠正
-
2 预存的充值的过期显示 3 自定义组件商品分组，视频本地上传的功能，扫一扫的组件 4 秒杀列表，拼单列表的广告，礼包的广告 5. 积分0积分的时候的优化
Showing
78 changed files
app.js
| ... | ... | @@ -178,7 +178,7 @@ App({ |
| 178 | 178 | success: function (o) { |
| 179 | 179 | console.log('getwuliu'); |
| 180 | 180 | console.log(o); |
| 181 | - if (o.data.code == 0) { | |
| 181 | + if (o.data.code == 0 && o.data.data && o.data.data.pageData && o.data.data.pageData.length>0) { | |
| 182 | 182 | var arr = o.data.data.pageData; |
| 183 | 183 | console.log(arr); |
| 184 | 184 | arr.forEach(function(item,index){ | ... | ... |
app.wxss
| ... | ... | @@ -446,12 +446,12 @@ background: #ffe3e2; |
| 446 | 446 | /* 图标字体(ty) */ |
| 447 | 447 | @font-face { |
| 448 | 448 | font-family: 'iconfont'; /* project id 2054717 */ |
| 449 | - src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot'); | |
| 450 | - src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot?#iefix') format('embedded-opentype'), | |
| 451 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff2') format('woff2'), | |
| 452 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff') format('woff'), | |
| 453 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.ttf') format('truetype'), | |
| 454 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.svg#iconfont') format('svg'); | |
| 449 | + src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot'); | |
| 450 | + src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot?#iefix') format('embedded-opentype'), | |
| 451 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff2') format('woff2'), | |
| 452 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff') format('woff'), | |
| 453 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.ttf') format('truetype'), | |
| 454 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.svg#iconfont') format('svg'); | |
| 455 | 455 | } |
| 456 | 456 | |
| 457 | 457 | .iconfont { |
| ... | ... | @@ -462,6 +462,10 @@ background: #ffe3e2; |
| 462 | 462 | -moz-osx-font-smoothing: grayscale; |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | +.icon-shanchu:before { | |
| 466 | + content: "\e61b"; | |
| 467 | +} | |
| 468 | + | |
| 465 | 469 | .icon-buqian:before { |
| 466 | 470 | content: "\e65f"; |
| 467 | 471 | } | ... | ... |
components/diy_goodsGroup/diy_goodsGroup.js
| ... | ... | @@ -112,7 +112,7 @@ Component({ |
| 112 | 112 | }, |
| 113 | 113 | |
| 114 | 114 | pageLifetimes: { |
| 115 | - //游客登陆后，只要更新卡的情况 | |
| 115 | + //游客登录后，只要更新卡的情况 | |
| 116 | 116 | show: function () { |
| 117 | 117 | //--初始化卡类-- |
| 118 | 118 | this.card_init(); |
| ... | ... | @@ -121,9 +121,13 @@ Component({ |
| 121 | 121 | |
| 122 | 122 | methods: { |
| 123 | 123 | // 这里是一个自定义方法 |
| 124 | - init: function (classstyle_id, wgroup) { | |
| 124 | + init:async function (classstyle_id, wgroup) { | |
| 125 | + | |
| 126 | + this.setData({classstyle_id:classstyle_id}) | |
| 127 | + | |
| 125 | 128 | var th = this; |
| 126 | 129 | var g_id = this.data.g_id; |
| 130 | + var len=this.data.firist_type_data.length; | |
| 127 | 131 | if (classstyle_id == 1) { |
| 128 | 132 | //---手动选择的时候--- |
| 129 | 133 | g_id = this.data.firist_type_data[th.data.firist_type_curr]; |
| ... | ... | @@ -147,7 +151,7 @@ Component({ |
| 147 | 151 | str += g_id[i].goodsid + ","; |
| 148 | 152 | } |
| 149 | 153 | str=str.substring(0, str.length - 1); |
| 150 | - app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str, { | |
| 154 | + await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str, { | |
| 151 | 155 | isShowLoading:false, |
| 152 | 156 | success: function(res) { |
| 153 | 157 | |
| ... | ... | @@ -179,8 +183,8 @@ Component({ |
| 179 | 183 | } |
| 180 | 184 | |
| 181 | 185 | //---控制有没有加载更多的按钮--- |
| 182 | - if (th.data.firist_type_curr == th.data.firist_type_data.length) {th.setData({ goods_btn: [] }); } | |
| 183 | - else th.setData({ goods_btn: res.data}); | |
| 186 | + if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); } | |
| 187 | + else th.setData({ goods_btn: [1,2]}); | |
| 184 | 188 | } |
| 185 | 189 | } |
| 186 | 190 | |
| ... | ... | @@ -199,7 +203,7 @@ Component({ |
| 199 | 203 | if(th.data.is_hot) r_data.is_hot=th.data.is_hot; |
| 200 | 204 | if(th.data.is_new) r_data.is_new=th.data.is_new; |
| 201 | 205 | |
| 202 | - app.request.promiseGet("/api/weshop/goods/page", { | |
| 206 | + await app.request.promiseGet("/api/weshop/goods/page", { | |
| 203 | 207 | data:r_data |
| 204 | 208 | }).then(res => { |
| 205 | 209 | //商品地址 |
| ... | ... | @@ -216,7 +220,7 @@ Component({ |
| 216 | 220 | break; |
| 217 | 221 | case "3": |
| 218 | 222 | var item = {}; |
| 219 | - app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", { | |
| 223 | + await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", { | |
| 220 | 224 | data: { |
| 221 | 225 | store_id:os.stoid , |
| 222 | 226 | gpid: wgroup, | ... | ... |
components/diy_goodsGroup/diy_goodsGroup.wxml
| ... | ... | @@ -602,14 +602,16 @@ |
| 602 | 602 | </block> |
| 603 | 603 | <view class="clear"></view> |
| 604 | 604 | </view> |
| 605 | + | |
| 606 | + | |
| 605 | 607 | <!-- 商品的显示不是左右 --> |
| 606 | 608 | <block wx:if="{{object.column!=5}}"> |
| 607 | -<block wx:if="{{object.classstyle=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> | |
| 609 | +<block wx:if="{{classstyle_id=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> | |
| 608 | 610 | <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> |
| 609 | 611 | {{loadText}} |
| 610 | 612 | </button> |
| 611 | 613 | </view></block> |
| 612 | -<block wx:if="{{object.classstyle!='1' }}"> | |
| 614 | +<block wx:if="{{classstyle_id!='1' }}"> | |
| 613 | 615 | <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> |
| 614 | 616 | <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button> |
| 615 | 617 | </view> | ... | ... |
components/diy_picMax/diy_picMax.wxss
| 1 | 1 | .picMax{ |
| 2 | 2 | width: 100%; |
| 3 | 3 | overflow: hidden; |
| 4 | + margin-top: -0.01rpx; | |
| 4 | 5 | } |
| 5 | 6 | .pic_item{ |
| 6 | - float: left; | |
| 7 | + float: left; margin: 0; padding: 0; | |
| 7 | 8 | } |
| 8 | -.pic_item image{width: 100%;vertical-align: bottom;} | |
| 9 | +.pic_item image{width: 100%;vertical-align: bottom; margin: 0; } | |
| 9 | 10 | .picMax-clear{clear: both;} |
| 10 | 11 | |
| 11 | 12 | |
| ... | ... | @@ -16,7 +17,10 @@ |
| 16 | 17 | position:absolute;top:0; left:0; |
| 17 | 18 | } |
| 18 | 19 | .pic_item2 image{ width: 100%; height: 100%;} |
| 19 | -.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;} | |
| 20 | +/* .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;} */ | |
| 21 | +.width_1{width: 25%}.width_2{width: 50%}.width_3{width: 75%}.width_4{width:100%} | |
| 22 | + | |
| 23 | + | |
| 20 | 24 | .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} |
| 21 | 25 | .mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;} |
| 22 | 26 | .mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;} |
| 23 | 27 | \ No newline at end of file | ... | ... |
components/diy_pingd_buy/diy_pingd_buy.js
components/diy_scan/diy_scan.js
0 → 100644
| 1 | +Component({ | |
| 2 | + properties: { | |
| 3 | + object: { | |
| 4 | + type: Object, | |
| 5 | + value: null | |
| 6 | + }, | |
| 7 | + // 这里定义了innerText属性，属性值可以在组件使用时指定 | |
| 8 | + }, | |
| 9 | + data: { | |
| 10 | + // 这里是一些组件内部数据 | |
| 11 | + someData: {}, | |
| 12 | + left:getApp().globalData.windowWidth-50, | |
| 13 | + top:200, | |
| 14 | + }, | |
| 15 | + methods: { | |
| 16 | + // 这里是一个自定义方法 | |
| 17 | + customMethod() { }, | |
| 18 | + //-- 如果触摸移动 -- | |
| 19 | + setTouchMove:function (e) { | |
| 20 | + var w=getApp().globalData.windowWidth; | |
| 21 | + if(e.touches[0].clientX<10 || e.touches[0].clientX>w-50) return false; | |
| 22 | + if(e.touches[0].clientY<10) return false; | |
| 23 | + this.setData({left: e.touches[0].clientX,top: e.touches[0].clientY}) | |
| 24 | + }, | |
| 25 | + | |
| 26 | + //-- 扫描成功之后 -- | |
| 27 | + getScancode:function(){ | |
| 28 | + var _this = this; | |
| 29 | + //-- 允许从相机和相册扫码 -- | |
| 30 | + wx.scanCode({ | |
| 31 | + success: (res) => { | |
| 32 | + var result = res.result; | |
| 33 | + wx.navigateTo({ | |
| 34 | + url: "/pages/goods/search/search?s_key=" + result, | |
| 35 | + }); | |
| 36 | + } | |
| 37 | + }) | |
| 38 | + } | |
| 39 | + } | |
| 40 | +}) | |
| 0 | 41 | \ No newline at end of file | ... | ... |
components/diy_scan/diy_scan.json
0 → 100644
components/diy_scan/diy_scan.wxml
0 → 100644
| 1 | +<view class="scan_view" disable-scroll="true" bindtap='getScancode' style="top:{{top}}px;left:{{left}}px;" bindtouchmove="setTouchMove"> | |
| 2 | + <view style="text-align: center;"> | |
| 3 | + <image class="cs-img" src="{{object.img}}"></image> | |
| 4 | + <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view> | |
| 5 | + </view> | |
| 6 | +</view> | |
| 7 | + | ... | ... |
components/diy_scan/diy_scan.wxss
0 → 100644
| 1 | +.scan_view{ | |
| 2 | + position: fixed;z-index: 100; left: 0; top: 0; width: 100rpx; height: 100rpx; | |
| 3 | + border-radius: 50%; background-color: rgba(125,125,2,0.5);box-shadow: #ccc 0px 0px 70px 1px; | |
| 4 | + display: flex;align-items: center;justify-content: center; color: #f8f8f8; | |
| 5 | +} | |
| 6 | +.cs-img{ width: 32rpx; height: 32rpx; } | |
| 7 | +.s_title{ font-size: 20rpx;} | |
| 0 | 8 | \ No newline at end of file | ... | ... |
components/diy_seckill/diy_seckill.js
components/diy_service/diy_service.wxml
components/diy_shopname/diy_shopname.js
| ... | ... | @@ -27,15 +27,21 @@ Component({ |
| 27 | 27 | //--所有商品-- |
| 28 | 28 | getApp().request.promiseGet("/api/weshop/goods/page/", |
| 29 | 29 | {data:{ isonsale: 1, store_id: o.stoid,page:1,pageSize:1}}).then(res => { |
| 30 | - var total=res.data.data.total; | |
| 31 | - th.setData({total:total}) | |
| 30 | + | |
| 31 | + if(res.data.code==0 && res.data.data){ | |
| 32 | + var total=res.data.data.total; | |
| 33 | + th.setData({total:total}) | |
| 34 | + } | |
| 32 | 35 | }) |
| 33 | 36 | |
| 34 | 37 | //--所有新品-- |
| 35 | 38 | getApp().request.promiseGet("/api/weshop/goods/page/", |
| 36 | 39 | {data:{is_new:1,isonsale: 1, store_id: o.stoid,page:1,pageSize:1}}).then(res => { |
| 37 | - var total=res.data.data.total; | |
| 38 | - th.setData({new_total:total}) | |
| 40 | + if(res.data.code==0 && res.data.data) | |
| 41 | + { | |
| 42 | + var total = res.data.data.total; | |
| 43 | + th.setData({new_total: total}) | |
| 44 | + } | |
| 39 | 45 | }) |
| 40 | 46 | |
| 41 | 47 | }, | ... | ... |
components/diy_video/diy_video.js
| 1 | +var t = getApp(), | |
| 2 | + a = t.request, | |
| 3 | + os = t.globalData.setting; | |
| 4 | + | |
| 1 | 5 | Component({ |
| 2 | 6 | properties: { |
| 3 | 7 | object: { |
| ... | ... | @@ -11,10 +15,17 @@ Component({ |
| 11 | 15 | // 这里是一些组件内部数据 |
| 12 | 16 | someData: {}, |
| 13 | 17 | videoUrl: "", |
| 18 | + url:os.imghost | |
| 14 | 19 | }, |
| 15 | 20 | |
| 16 | - ready: function () { | |
| 17 | - this.create_url(); | |
| 21 | + ready: function () { | |
| 22 | + //-- 如果是本地视频的时候 -- | |
| 23 | + if(this.properties.object.style!=2){ | |
| 24 | + //网络地址 | |
| 25 | + this.create_url(); | |
| 26 | + }else{ | |
| 27 | + this.setData({videoUrl:this.properties.object.src}); | |
| 28 | + } | |
| 18 | 29 | }, |
| 19 | 30 | methods: { |
| 20 | 31 | // 这里是一个自定义方法 | ... | ... |
components/diy_video/diy_video.wxml
components/goods_list/goods_list.js
| ... | ... | @@ -24,7 +24,7 @@ Component({ |
| 24 | 24 | ready: function () { |
| 25 | 25 | }, |
| 26 | 26 | pageLifetimes:{ |
| 27 | - //要处理一下，游客登陆后的界面的变化,主要还该是改变会员 | |
| 27 | + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 | |
| 28 | 28 | show: function () { |
| 29 | 29 | this.init(); |
| 30 | 30 | } |
| ... | ... | @@ -151,6 +151,16 @@ Component({ |
| 151 | 151 | var th = this; |
| 152 | 152 | getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, |
| 153 | 153 | {}).then(res => { |
| 154 | + | |
| 155 | + if(res.data.code!=0 || !res.data.data){ | |
| 156 | + var ob = { | |
| 157 | + "card_list": [], | |
| 158 | + "name_map": "" | |
| 159 | + }; | |
| 160 | + func(ob); | |
| 161 | + return false; | |
| 162 | + } | |
| 163 | + | |
| 154 | 164 | var plusCard = res.data.data; |
| 155 | 165 | var arr = [1219, 2089, 3031]; |
| 156 | 166 | var new_arr = new Array(); | ... | ... |
packageA/pages/activity_share/activity_share.js
| ... | ... | @@ -59,7 +59,7 @@ Page({ |
| 59 | 59 | var StaffId=options.StaffId; |
| 60 | 60 | var StorageId=options.StorageId; |
| 61 | 61 | if(first_leader){ |
| 62 | - //-- user_id代过来免登陆 -- | |
| 62 | + //-- user_id代过来免登录 -- | |
| 63 | 63 | getApp().globalData.user_id=first_leader; |
| 64 | 64 | getApp().getUserFir(); |
| 65 | 65 | |
| ... | ... | @@ -466,6 +466,13 @@ Page({ |
| 466 | 466 | var storid = oo.stoid; |
| 467 | 467 | var th = this; |
| 468 | 468 | getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { |
| 469 | + | |
| 470 | + if(res.data.code!=0 || !res.data.data){ | |
| 471 | + var ob={"card_list":[],"name_map":''}; | |
| 472 | + func(ob); | |
| 473 | + return false; | |
| 474 | + } | |
| 475 | + | |
| 469 | 476 | var plusCard = res.data.data; |
| 470 | 477 | var arr = [1219, 2089, 3031]; |
| 471 | 478 | var new_arr = new Array(); | ... | ... |
packageA/pages/chongzhi/chongzhi.wxml
| ... | ... | @@ -36,6 +36,7 @@ |
| 36 | 36 | <view class="bottom" wx:if="{{currentIndex == 0}}" > |
| 37 | 37 | <text wx:if="{{g_filter.is_acting(item.EndDate)}}" |
| 38 | 38 | catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text> |
| 39 | + <text wx:else class="btn" style="background-color: #ccc;">已过期</text> | |
| 39 | 40 | <text data-index="{{index}}" class="btn details" >详情</text> |
| 40 | 41 | </view> |
| 41 | 42 | <view class="bottom" wx:if="{{currentIndex == 1}}" > | ... | ... |
packageA/pages/goods_share/goods_share.js
| ... | ... | @@ -36,7 +36,7 @@ Page({ |
| 36 | 36 | var StaffId=options.StaffId; |
| 37 | 37 | var StorageId=options.StorageId; |
| 38 | 38 | if(first_leader){ |
| 39 | - //-- user_id代过来免登陆 -- | |
| 39 | + //-- user_id代过来免登录 -- | |
| 40 | 40 | getApp().globalData.user_id=first_leader; |
| 41 | 41 | getApp().getUserFir(); |
| 42 | 42 | |
| ... | ... | @@ -281,6 +281,13 @@ Page({ |
| 281 | 281 | var storid = oo.stoid; |
| 282 | 282 | var th = this; |
| 283 | 283 | getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { |
| 284 | + | |
| 285 | + if(res.data.code!=0 || !res.data.data){ | |
| 286 | + var ob={"card_list":[],"name_map":''}; | |
| 287 | + func(ob); | |
| 288 | + return false; | |
| 289 | + } | |
| 290 | + | |
| 284 | 291 | var plusCard = res.data.data; |
| 285 | 292 | var arr = [1219, 2089, 3031]; |
| 286 | 293 | var new_arr = new Array(); | ... | ... |
packageA/pages/jfbuy/jfbuy.js
| ... | ... | @@ -80,7 +80,7 @@ Page({ |
| 80 | 80 | // //接受有没有导购的参数 |
| 81 | 81 | // var first_leader=options.first_leader; |
| 82 | 82 | // if(first_leader){ |
| 83 | - // //-- user_id代过来免登陆 -- | |
| 83 | + // //-- user_id代过来免登录 -- | |
| 84 | 84 | // getApp().globalData.user_id=first_leader; |
| 85 | 85 | // getApp().getUserFir(); |
| 86 | 86 | // } |
| ... | ... | @@ -297,7 +297,7 @@ Page({ |
| 297 | 297 | // 关闭加载状态 |
| 298 | 298 | th.data.is_load2=0; |
| 299 | 299 | // 请求成功 |
| 300 | - if(res.data.code==0) { | |
| 300 | + if(res.data.code==0 && res.data.data && res.data.data.pageData) { | |
| 301 | 301 | if(res.data.data.pageData.length>0) { |
| 302 | 302 | th.data.currentPage2++; |
| 303 | 303 | var data = res.data.data.pageData; | ... | ... |
packageA/pages/liveStreamDetails/liveStreamDetails.js
| ... | ... | @@ -399,13 +399,18 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un |
| 399 | 399 | this.getSystemInfo(); |
| 400 | 400 | |
| 401 | 401 | var first_leader=options.first_leader; |
| 402 | + var staffId=options.staffId; | |
| 403 | + var storageId=options.storageId; | |
| 404 | + | |
| 402 | 405 | if(first_leader){ |
| 403 | - //-- user_id代过来免登陆 -- | |
| 406 | + //-- user_id代过来免登录 -- | |
| 404 | 407 | getApp().globalData.first_leader=first_leader; |
| 405 | 408 | //调用接口判断是不是会员 |
| 406 | 409 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{ |
| 407 | 410 | if(res.data.code==0){ |
| 408 | - getApp().globalData.guide_id=res.data.data.id; | |
| 411 | + getApp().globalData.guide_id=res.data.data.id; | |
| 412 | + getApp().globalData.staffId=staffId; | |
| 413 | + getApp().globalData.storageId=storageId; | |
| 409 | 414 | } |
| 410 | 415 | }) |
| 411 | 416 | } |
| ... | ... | @@ -420,6 +425,22 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un |
| 420 | 425 | that.setData({ |
| 421 | 426 | details: obj |
| 422 | 427 | }) |
| 428 | + | |
| 429 | + //-- 如果是导购的时候 -- | |
| 430 | + if(getApp().globalData.guide_id && getApp().globalData.user_id){ | |
| 431 | + //报错领取记录 | |
| 432 | + var record={}; | |
| 433 | + record.storeId=os.stoid; | |
| 434 | + record.ReceiveTime=ut.formatTime(); | |
| 435 | + record.ReceiveType=7; | |
| 436 | + record.ReceiveUserId=getApp().globalData.user_id; | |
| 437 | + record.ShareStaffId=getApp().globalData.staffId; | |
| 438 | + record.ShareStorageId=getApp().globalData.storageId; | |
| 439 | + record.shareActId=details.id; | |
| 440 | + record.shareActName=details.name; | |
| 441 | + getApp().request.promiseGet.post('api/weshop/MdReceiveType/saveReceive',{data:record}).then(res=>{}) | |
| 442 | + } | |
| 443 | + | |
| 423 | 444 | |
| 424 | 445 | |
| 425 | 446 | // 请求主图 | ... | ... |
packageA/pages/live_share/live_share.js
packageA/pages/prom_list/prom_list.js
| ... | ... | @@ -39,6 +39,7 @@ Page({ |
| 39 | 39 | goodsInputNum:1, |
| 40 | 40 | g_buy_num: null, |
| 41 | 41 | sele_collocation:null, |
| 42 | + | |
| 42 | 43 | }, |
| 43 | 44 | |
| 44 | 45 | //------初始化加载---------- |
| ... | ... | @@ -108,7 +109,7 @@ Page({ |
| 108 | 109 | getApp().request.promiseGet("/api/weshop/pickup/list",{ |
| 109 | 110 | data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, |
| 110 | 111 | }).then(res=>{ |
| 111 | - if(res.data.code==0){ | |
| 112 | + if(res.data.code==0 && res.data.data && res.data.data.pageData){ | |
| 112 | 113 | e=res.data.data.pageData[0]; |
| 113 | 114 | if (e){ |
| 114 | 115 | appd.pk_store=e; |
| ... | ... | @@ -722,7 +723,7 @@ Page({ |
| 722 | 723 | if (e.data.code == 0) { |
| 723 | 724 | |
| 724 | 725 | //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 |
| 725 | - if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){ | |
| 726 | + if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){ | |
| 726 | 727 | th.setData({ |
| 727 | 728 | def_pick_store:e.data.data.pageData[0], |
| 728 | 729 | sto_sele_name: e.data.data.pageData[0].pickup_name, |
| ... | ... | @@ -905,7 +906,7 @@ Page({ |
| 905 | 906 | only_pk: e.data.data.pageData |
| 906 | 907 | }); |
| 907 | 908 | //-----如果没有默认门店，要取第一个门店作为默认店------ |
| 908 | - if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { | |
| 909 | + if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { | |
| 909 | 910 | th.setData({ |
| 910 | 911 | def_pick_store:e.data.data.pageData[0], |
| 911 | 912 | sto_sele_name: e.data.data.pageData[0].pickup_name, |
| ... | ... | @@ -1149,7 +1150,7 @@ Page({ |
| 1149 | 1150 | } |
| 1150 | 1151 | |
| 1151 | 1152 | |
| 1152 | - if (bconfig.is_sort_storage) { | |
| 1153 | + if (bconfig && bconfig.is_sort_storage) { | |
| 1153 | 1154 | wx.getLocation({ |
| 1154 | 1155 | type: 'gcj02', |
| 1155 | 1156 | success: function(res) { |
| ... | ... | @@ -1478,7 +1479,7 @@ Page({ |
| 1478 | 1479 | th.data.t_time = setInterval(function() { |
| 1479 | 1480 | if (th.data.bconfig == null) false; |
| 1480 | 1481 | var e = th.data.bconfig; |
| 1481 | - if (e.is_sort_storage) { | |
| 1482 | + if (e && e.is_sort_storage) { | |
| 1482 | 1483 | wx.getLocation({ |
| 1483 | 1484 | type: 'gcj02', |
| 1484 | 1485 | success: function(res) { |
| ... | ... | @@ -1526,6 +1527,13 @@ Page({ |
| 1526 | 1527 | var storid = os.stoid; |
| 1527 | 1528 | var th = this; |
| 1528 | 1529 | getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { |
| 1530 | + | |
| 1531 | + if(res.data.code!=0 || !res.data.data){ | |
| 1532 | + var ob={"card_list":[],"name_map":''}; | |
| 1533 | + func(ob); | |
| 1534 | + return false; | |
| 1535 | + } | |
| 1536 | + | |
| 1529 | 1537 | var plusCard = res.data.data; |
| 1530 | 1538 | var arr = [1219, 2089, 3031]; |
| 1531 | 1539 | var new_arr = new Array(); | ... | ... |
packageA/pages/quan/quan.js
packageA/pages/quan_list/quan_list.wxml
| ... | ... | @@ -17,7 +17,9 @@ |
| 17 | 17 | <!-- 右边 --> |
| 18 | 18 | <view class="right fs24 co_g pding" style="background-image:url({{iurl}}/miniapp/images/coupon_img/white.png); position: relative"> |
| 19 | 19 | <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view> |
| 20 | - <view style="margin-top: 5rpx">所有门店通用</view> | |
| 20 | + | |
| 21 | + <view class="ellipsis-1" style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view> | |
| 22 | + <view style="margin-top: 5rpx" wx:else>所有门店通用</view> | |
| 21 | 23 | <view wx:if="{{item.endtype==0}}">有效期 |
| 22 | 24 | <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text> |
| 23 | 25 | <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至 | ... | ... |
packageA/pages/quan_pro/quan_pro.js
| ... | ... | @@ -23,7 +23,7 @@ Page({ |
| 23 | 23 | var th = this; |
| 24 | 24 | var first_leader=t.first_leader; |
| 25 | 25 | if(first_leader){ |
| 26 | - //-- user_id代过来免登陆 -- | |
| 26 | + //-- user_id代过来免登录 -- | |
| 27 | 27 | getApp().globalData.first_leader=first_leader; |
| 28 | 28 | //调用接口判断是不是会员 |
| 29 | 29 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ | ... | ... |
packageA/pages/quan_pro/quan_pro.wxml
| ... | ... | @@ -8,15 +8,20 @@ |
| 8 | 8 | <image style="width: 100%; height: 450rpx" src="{{iurl}}/miniapp/images/coupon_img/q_detail_bg.png"></image> |
| 9 | 9 | <view class="q_content"> |
| 10 | 10 | <view class="upper flex jc_sb co-w"> |
| 11 | - <view class="left fs30"> | |
| 11 | + <view class="left fs30" style="width: 440rpx;"> | |
| 12 | 12 | <view> |
| 13 | 13 | <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image> |
| 14 | 14 | {{q_data.name}} |
| 15 | 15 | </view> |
| 16 | - <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"><view class="t_circle"></view> | |
| 17 | - <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text> | |
| 18 | - <text wx:else>仅限{{q_data.useobjectname}}使用</text> | |
| 16 | + <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"> | |
| 17 | + <view class="t_circle"></view> | |
| 18 | + <view> | |
| 19 | + <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text> | |
| 20 | + <text wx:else>仅限{{q_data.useobjectname}}使用</text> | |
| 21 | + </view> | |
| 22 | + | |
| 19 | 23 | </view> |
| 24 | + <view class="ellipsis-3" style="margin-top: 20rpx;">{{q_data.coupon_remark}}</view> | |
| 20 | 25 | </view> |
| 21 | 26 | <view class="right" style="margin-right: 80rpx;"> |
| 22 | 27 | <view class="f40 t-c" style="margin-top: 100rpx"><text class="fs26">￥</text>{{filters.toFix(q_data.money,2)}}</view> | ... | ... |
pages/activity/pind_list/pind_list.js
| ... | ... | @@ -14,12 +14,14 @@ Page({ |
| 14 | 14 | timer:null, |
| 15 | 15 | ismore:1, |
| 16 | 16 | isshow:0, |
| 17 | - iurl: os.imghost, | |
| 17 | + iurl: os.imghost, | |
| 18 | + ad_data:null, | |
| 18 | 19 | }, |
| 19 | 20 | |
| 20 | 21 | //------初始化加载---------- |
| 21 | 22 | onLoad: function(t) { |
| 22 | 23 | var first_leader = t.first_leader; |
| 24 | + var th=this; | |
| 23 | 25 | |
| 24 | 26 | console.log("------------"); |
| 25 | 27 | console.log(first_leader); |
| ... | ... | @@ -33,6 +35,22 @@ Page({ |
| 33 | 35 | } |
| 34 | 36 | }) |
| 35 | 37 | } |
| 38 | + | |
| 39 | + getApp().request.promiseGet("/api/weshop/ad/page?pid=801&store_id=" + os.stoid, { | |
| 40 | + data: { | |
| 41 | + enabled: 1 | |
| 42 | + } | |
| 43 | + }).then(res => { | |
| 44 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 45 | + var a = res.data.data.pageData; | |
| 46 | + var tt = { | |
| 47 | + 'ad_code': os.imghost + a[0].ad_code, | |
| 48 | + 'media_link': '', | |
| 49 | + 'ad_weapplink':a[0].ad_weapplink | |
| 50 | + }; | |
| 51 | + th.setData({ad_data:tt}); | |
| 52 | + } | |
| 53 | + }) | |
| 36 | 54 | }, |
| 37 | 55 | |
| 38 | 56 | onShow: function(t) { | ... | ... |
pages/activity/pind_list/pind_list.wxml
| ... | ... | @@ -2,8 +2,13 @@ |
| 2 | 2 | |
| 3 | 3 | <view class=" body_frame"> |
| 4 | 4 | |
| 5 | -<image class="xc-top-img" src="{{url}}/miniapp/images/team.jpg"> | |
| 6 | -</image> | |
| 5 | +<block wx:if="{{ad_data}}"> | |
| 6 | + <image mode="widthFix" src="{{ad_data.ad_code}}" style="width: 100%;"></image> | |
| 7 | +</block> | |
| 8 | +<block wx:else> | |
| 9 | + <image class="xc-top-img" src="{{url}}/miniapp/images/team.jpg"></image> | |
| 10 | +</block> | |
| 11 | + | |
| 7 | 12 | |
| 8 | 13 | <view class="kill-list"> |
| 9 | 14 | <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide==1}}"> | ... | ... |
pages/activity/seckill_list/seckill_list.js
| ... | ... | @@ -11,11 +11,13 @@ Page({ |
| 11 | 11 | timer:null, |
| 12 | 12 | ismore:1, //是否可以加载更多 |
| 13 | 13 | isshow:0, |
| 14 | + ad_data:null, | |
| 14 | 15 | }, |
| 15 | 16 | |
| 16 | 17 | //------初始化加载---------- |
| 17 | 18 | onLoad: function(t) { |
| 18 | 19 | var first_leader = t.first_leader; |
| 20 | + var th=this; | |
| 19 | 21 | |
| 20 | 22 | console.log("------------"); |
| 21 | 23 | console.log(first_leader); |
| ... | ... | @@ -29,6 +31,23 @@ Page({ |
| 29 | 31 | } |
| 30 | 32 | }) |
| 31 | 33 | } |
| 34 | + | |
| 35 | + getApp().request.promiseGet("/api/weshop/ad/page?pid=701&store_id=" + os.stoid, { | |
| 36 | + data: { | |
| 37 | + enabled: 1 | |
| 38 | + } | |
| 39 | + }).then(res => { | |
| 40 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 41 | + var a = res.data.data.pageData; | |
| 42 | + var tt = { | |
| 43 | + 'ad_code': os.imghost + a[0].ad_code, | |
| 44 | + 'media_link': '', | |
| 45 | + 'ad_weapplink':a[0].ad_weapplink | |
| 46 | + }; | |
| 47 | + th.setData({ad_data:tt}); | |
| 48 | + } | |
| 49 | + }) | |
| 50 | + | |
| 32 | 51 | }, |
| 33 | 52 | |
| 34 | 53 | |
| ... | ... | @@ -177,6 +196,12 @@ Page({ |
| 177 | 196 | _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; |
| 178 | 197 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
| 179 | 198 | } |
| 180 | - } | |
| 199 | + }, | |
| 200 | + | |
| 201 | + onShareTimeline() { | |
| 202 | + return { | |
| 203 | + title: '秒杀活动-' + getApp().globalData.config.store_name, | |
| 204 | + } | |
| 205 | + }, | |
| 181 | 206 | |
| 182 | 207 | }); | ... | ... |
pages/activity/seckill_list/seckill_list.wxml
| ... | ... | @@ -2,8 +2,12 @@ |
| 2 | 2 | <block wx:if="{{isshow}}"> |
| 3 | 3 | <view class=" body_frame"> |
| 4 | 4 | |
| 5 | -<image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"> | |
| 6 | -</image> | |
| 5 | +<block wx:if="{{ad_data}}"> | |
| 6 | + <image mode="widthFix" src="{{ad_data.ad_code}}" style="width: 100%;"></image> | |
| 7 | +</block> | |
| 8 | +<block wx:else> | |
| 9 | + <image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"></image> | |
| 10 | +</block> | |
| 7 | 11 | |
| 8 | 12 | |
| 9 | 13 | <view class="kill-list abs seckill_list"> | ... | ... |
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
| ... | ... | @@ -946,7 +946,7 @@ Page({ |
| 946 | 946 | await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods",{ |
| 947 | 947 | data:{store_id:os.stoid,id:no_ex_id} |
| 948 | 948 | }).then(res=>{ |
| 949 | - if(res.data.code==0){ | |
| 949 | + if(res.data.code==0 && res.data.data && res.data.data.length>0){ | |
| 950 | 950 | by_qc=res.data.data[0]; |
| 951 | 951 | } |
| 952 | 952 | }) |
| ... | ... | @@ -1007,7 +1007,7 @@ Page({ |
| 1007 | 1007 | WareIds: cart_item.check_quan_ware_list |
| 1008 | 1008 | } |
| 1009 | 1009 | }).then(res => { |
| 1010 | - if (res.data.code == 0 && res.data.data.length > 0) { | |
| 1010 | + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { | |
| 1011 | 1011 | var q_data = res.data.data; |
| 1012 | 1012 | //--存储商品优惠的内容-- |
| 1013 | 1013 | cart_item.quan_youhui_list = q_data; |
| ... | ... | @@ -1337,6 +1337,9 @@ Page({ |
| 1337 | 1337 | //---------计算立即购买---------- |
| 1338 | 1338 | calculatePrice2: function () { |
| 1339 | 1339 | var th = this, good = this.data.bn_goods; |
| 1340 | + | |
| 1341 | + if(!good) return false; | |
| 1342 | + | |
| 1340 | 1343 | //搭配的计算要用购物的车计算方法 |
| 1341 | 1344 | if(good.prom_type==5){ |
| 1342 | 1345 | th.calculatePrice(); |
| ... | ... | @@ -1378,7 +1381,7 @@ Page({ |
| 1378 | 1381 | await getApp().request.promiseGet("/api/weshop/couponList/getUseCouponPrice",{ |
| 1379 | 1382 | data:{storeId:oo.stoid,CashRepNo:quan_no, WaresSum:th.data.ckeck_quan_price, WareIds:th.data.check_quan_ware_list} |
| 1380 | 1383 | }).then(res=>{ |
| 1381 | - if(res.data.code==0){ | |
| 1384 | + if(res.data.code==0 && res.data.data && res.data.data.length>0 ){ | |
| 1382 | 1385 | quan_price=res.data.data[0].WareCashSum; |
| 1383 | 1386 | } |
| 1384 | 1387 | }) |
| ... | ... | @@ -1442,7 +1445,7 @@ Page({ |
| 1442 | 1445 | await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods",{ |
| 1443 | 1446 | data:{store_id:os.stoid,id:no_ex_id} |
| 1444 | 1447 | }).then(res=>{ |
| 1445 | - if(res.data.code==0){ | |
| 1448 | + if(res.data.code==0 && res.data.data && res.data.data.length>0){ | |
| 1446 | 1449 | no_by_data=res.data.data[0]; |
| 1447 | 1450 | //如果有设置不包邮区域的时候 |
| 1448 | 1451 | if(res.data.data[0].region_list){ |
| ... | ... | @@ -2027,7 +2030,7 @@ Page({ |
| 2027 | 2030 | },// 设置请求的 header |
| 2028 | 2031 | success: function (res) { |
| 2029 | 2032 | |
| 2030 | - th.data.is_summit_ing=0; //是否提交中 | |
| 2033 | + | |
| 2031 | 2034 | wx.hideLoading(); |
| 2032 | 2035 | if (res.statusCode == 200) { |
| 2033 | 2036 | var data=res.data; |
| ... | ... | @@ -2110,6 +2113,7 @@ Page({ |
| 2110 | 2113 | return; |
| 2111 | 2114 | }else if(res.confirm){ |
| 2112 | 2115 | th.data.is_continue=1; |
| 2116 | + th.data.is_summit_ing=0; //是否提交中 | |
| 2113 | 2117 | th.submitForm(sub_value); |
| 2114 | 2118 | } |
| 2115 | 2119 | } |
| ... | ... | @@ -2120,8 +2124,10 @@ Page({ |
| 2120 | 2124 | msg=msg.slice(0, 13) + "\r\n"+ msg.slice(13); |
| 2121 | 2125 | } |
| 2122 | 2126 | getApp().confirmBox(msg); |
| 2127 | + th.data.is_summit_ing=0; //是否提交中 | |
| 2123 | 2128 | } |
| 2124 | 2129 | }else{ |
| 2130 | + th.data.is_summit_ing=0; //是否提交中 | |
| 2125 | 2131 | console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); |
| 2126 | 2132 | } |
| 2127 | 2133 | }, | ... | ... |
pages/cart/cart2_pt/cart2_pt.js
| ... | ... | @@ -585,7 +585,7 @@ Page({ |
| 585 | 585 | 'content-type': 'application/json' |
| 586 | 586 | },// 设置请求的 header |
| 587 | 587 | success: function (res) { |
| 588 | - th.data.is_summit_ing=0; //是否提交中 | |
| 588 | + | |
| 589 | 589 | wx.hideLoading(); |
| 590 | 590 | if (res.statusCode == 200) { |
| 591 | 591 | var data=res.data; |
| ... | ... | @@ -613,15 +613,18 @@ Page({ |
| 613 | 613 | // }, 1); |
| 614 | 614 | util_pay.pay(data.data, function() { |
| 615 | 615 | setTimeout(function () { |
| 616 | - wx.navigateTo({ | |
| 616 | + wx.reLaunch({ | |
| 617 | 617 | //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, |
| 618 | - url: "/pages/team/team_success/team_success?ordersn=" + data.data, | |
| 618 | + url: "/pages/team/team_success/team_success?ordersn=" + data.data, | |
| 619 | 619 | }) |
| 620 | 620 | },1000) |
| 621 | 621 | }, function () { |
| 622 | 622 | //支付失败 |
| 623 | 623 | setTimeout(function () { |
| 624 | - wx.navigateBack({ delta: 1 }) | |
| 624 | + //wx.navigateBack({ delta: 1 }) | |
| 625 | + wx.reLaunch({ | |
| 626 | + url: "/pages/user/order_list/order_list", | |
| 627 | + }) | |
| 625 | 628 | },1000) |
| 626 | 629 | |
| 627 | 630 | },oo.stoid,1); |
| ... | ... | @@ -647,9 +650,12 @@ Page({ |
| 647 | 650 | url: "/pages/user/order_list/order_list", |
| 648 | 651 | })--*/ |
| 649 | 652 | var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data; |
| 650 | - getApp().goto(url); | |
| 653 | + wx.reLaunch({ | |
| 654 | + url: url | |
| 655 | + }) | |
| 656 | + | |
| 651 | 657 | }else{ |
| 652 | - wx.navigateTo({ | |
| 658 | + wx.reLaunch({ | |
| 653 | 659 | url: "/pages/team/team_success/team_success?ordersn=" + data.data, |
| 654 | 660 | }) |
| 655 | 661 | } |
| ... | ... | @@ -661,13 +667,16 @@ Page({ |
| 661 | 667 | } |
| 662 | 668 | } |
| 663 | 669 | else{ |
| 670 | + th.data.is_summit_ing=0; //是否提交中 | |
| 664 | 671 | getApp().confirmBox(data.msg); |
| 665 | 672 | } |
| 666 | 673 | } else { |
| 674 | + th.data.is_summit_ing=0; //是否提交中 | |
| 667 | 675 | console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); |
| 668 | 676 | } |
| 669 | 677 | }, |
| 670 | 678 | fail: function () { |
| 679 | + th.data.is_summit_ing=0; //是否提交中 | |
| 671 | 680 | wx.hideLoading(); |
| 672 | 681 | console.log("index.js wx.request CheckCallUser fail"); |
| 673 | 682 | }, | ... | ... |
pages/cart/cart4/cart4.js
| ... | ... | @@ -27,7 +27,7 @@ Page({ |
| 27 | 27 | data:data, |
| 28 | 28 | success:function(rs){ |
| 29 | 29 | |
| 30 | - if(rs.data.code==0){ | |
| 30 | + if(rs.data.code==0 && rs.data.data && rs.data.data.pageData && rs.data.data.pageData.length>0){ | |
| 31 | 31 | //支付的金额 |
| 32 | 32 | rs.data.data.pageData.forEach(function(ie,ind){ |
| 33 | 33 | order_m+=ie.order_amount; | ... | ... |
pages/giftpack/buygiftpack/giftpackbuy.js
| ... | ... | @@ -25,6 +25,7 @@ Page({ |
| 25 | 25 | curpage: 1, //当前分页数 |
| 26 | 26 | pageSize: 10, //页大小 |
| 27 | 27 | total: 0, //总数量 |
| 28 | + ad_data:null, | |
| 28 | 29 | }, |
| 29 | 30 | onLoad: function(options) { |
| 30 | 31 | |
| ... | ... | @@ -35,6 +36,25 @@ Page({ |
| 35 | 36 | getStorageID: a.stoid, |
| 36 | 37 | getUserID: d.user_id |
| 37 | 38 | }) |
| 39 | + | |
| 40 | + | |
| 41 | + getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { | |
| 42 | + data: { | |
| 43 | + enabled: 1 | |
| 44 | + } | |
| 45 | + }).then(res => { | |
| 46 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 47 | + var a = res.data.data.pageData; | |
| 48 | + var tt = { | |
| 49 | + 'ad_code': os.imghost + a[0].ad_code, | |
| 50 | + 'media_link': '', | |
| 51 | + 'ad_weapplink':a[0].ad_weapplink, | |
| 52 | + 'bgcolor':a[0].bgcolor, | |
| 53 | + }; | |
| 54 | + th.setData({ad_data:tt}); | |
| 55 | + } | |
| 56 | + }) | |
| 57 | + | |
| 38 | 58 | |
| 39 | 59 | }, |
| 40 | 60 | onShow: function() { |
| ... | ... | @@ -73,6 +93,13 @@ Page({ |
| 73 | 93 | "userId": that.getUserID, //用户ID |
| 74 | 94 | "buyFrom": 2 |
| 75 | 95 | }; |
| 96 | + | |
| 97 | + //-- 分享导购要记录 -- | |
| 98 | + if(getApp().globalData.guide_id){ | |
| 99 | + json.guide_id=getApp().globalData.guide_id; | |
| 100 | + } | |
| 101 | + | |
| 102 | + | |
| 76 | 103 | var data = JSON.stringify(json); |
| 77 | 104 | var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; |
| 78 | 105 | getApp().request.json_post(url, json, |
| ... | ... | @@ -134,6 +161,13 @@ Page({ |
| 134 | 161 | "userId": that.getUserID, //用户ID |
| 135 | 162 | "buyFrom": 2 |
| 136 | 163 | }; |
| 164 | + | |
| 165 | + //-- 分享导购要记录 -- | |
| 166 | + if(getApp().globalData.guide_id){ | |
| 167 | + json.guide_id=getApp().globalData.guide_id; | |
| 168 | + } | |
| 169 | + | |
| 170 | + | |
| 137 | 171 | var data = JSON.stringify(json); |
| 138 | 172 | var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; |
| 139 | 173 | getApp().request.json_post(url, json, | ... | ... |
pages/giftpack/buygiftpack/giftpackbuy.wxml
| 1 | -<view class="top_img"> | |
| 2 | - <view class="top_img"> | |
| 3 | - <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image> | |
| 4 | - </view> | |
| 1 | +<view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};"> | |
| 2 | + <block wx:if="{{ad_data}}"> | |
| 3 | + <view class="top_img"> | |
| 4 | + <image src="{{ad_data.ad_code}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image> | |
| 5 | + </view> | |
| 6 | + </block> | |
| 7 | + <block wx:else> | |
| 8 | + <view class="top_img"> | |
| 9 | + <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image> | |
| 10 | + </view> | |
| 11 | + </block> | |
| 12 | + | |
| 13 | + | |
| 5 | 14 | <view class="top_title"> |
| 6 | 15 | <view class="top_title_box"> |
| 7 | 16 | <text class="top_title_redtext">礼包列表</text> | ... | ... |
pages/giftpack/buygiftpack/giftpackbuy.wxss
pages/giftpack/giftpacklist/giftpacklist.js
| ... | ... | @@ -41,7 +41,7 @@ Page({ |
| 41 | 41 | //-- 获取分享人的ID -- |
| 42 | 42 | var first_leader=options.first_leader; |
| 43 | 43 | if(first_leader){ |
| 44 | - //-- user_id代过来免登陆 -- | |
| 44 | + //-- user_id代过来免登录 -- | |
| 45 | 45 | getApp().globalData.first_leader=first_leader; |
| 46 | 46 | //调用接口判断是不是会员 |
| 47 | 47 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ |
| ... | ... | @@ -141,10 +141,8 @@ Page({ |
| 141 | 141 | |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - | |
| 145 | 144 | ) |
| 146 | 145 | |
| 147 | - | |
| 148 | 146 | }, |
| 149 | 147 | GetBuyIntegral: function(e) { |
| 150 | 148 | var that = this.data; |
| ... | ... | @@ -175,6 +173,13 @@ Page({ |
| 175 | 173 | "userId": d.user_id, //用户ID |
| 176 | 174 | "buyFrom":2 |
| 177 | 175 | }; |
| 176 | + | |
| 177 | + //-- 分享导购要记录 -- | |
| 178 | + if(getApp().globalData.guide_id){ | |
| 179 | + json.guide_id=getApp().globalData.guide_id; | |
| 180 | + } | |
| 181 | + | |
| 182 | + | |
| 178 | 183 | var data = JSON.stringify(json); |
| 179 | 184 | var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; |
| 180 | 185 | getApp().request.json_post(url, json, | ... | ... |
pages/giftpack/mygiftpack/mygiftpack.js
| ... | ... | @@ -25,6 +25,7 @@ Page({ |
| 25 | 25 | curpage: 1, //当前分页数 |
| 26 | 26 | pageSize: 10, //页大小 |
| 27 | 27 | total: 0, //总数量 |
| 28 | + ad_data:null, | |
| 28 | 29 | }, |
| 29 | 30 | |
| 30 | 31 | onLoad: function(options) { |
| ... | ... | @@ -36,6 +37,23 @@ Page({ |
| 36 | 37 | loadingType: 0, |
| 37 | 38 | getDate: i.formatTime(new Date().getTime()) |
| 38 | 39 | }) |
| 40 | + | |
| 41 | + getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { | |
| 42 | + data: { | |
| 43 | + enabled: 1 | |
| 44 | + } | |
| 45 | + }).then(res => { | |
| 46 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 47 | + var a = res.data.data.pageData; | |
| 48 | + var tt = { | |
| 49 | + 'ad_code': os.imghost + a[0].ad_code, | |
| 50 | + 'media_link': '', | |
| 51 | + 'ad_weapplink':a[0].ad_weapplink, | |
| 52 | + 'bgcolor':a[0].bgcolor, | |
| 53 | + }; | |
| 54 | + th.setData({ad_data:tt}); | |
| 55 | + } | |
| 56 | + }) | |
| 39 | 57 | |
| 40 | 58 | }, |
| 41 | 59 | onShow: function() { | ... | ... |
pages/giftpack/mygiftpack/mygiftpack.wxml
| 1 | -<view class="top_img"> | |
| 2 | - <view class="top_img"> | |
| 3 | - <!-- <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift00.jpg'}}"></image> --> | |
| 4 | - <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image> | |
| 5 | - </view> | |
| 1 | +<view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};"> | |
| 2 | + <block wx:if="{{ad_data}}"> | |
| 3 | + <view class="top_img"> | |
| 4 | + <image src="{{ad_data.ad_code}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image> | |
| 5 | + </view> | |
| 6 | + </block> | |
| 7 | + <block wx:else> | |
| 8 | + <view class="top_img"> | |
| 9 | + <!-- <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift00.jpg'}}"></image> --> | |
| 10 | + <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image> | |
| 11 | + </view> | |
| 12 | + </block> | |
| 13 | + | |
| 14 | + | |
| 6 | 15 | <view class="top_title"> |
| 7 | 16 | <view class="top_title_box"> |
| 8 | 17 | <text class="top_title_blacktext" bindtap="redirectTo" data-url="/pages/giftpack/buygiftpack/giftpackbuy">礼包列表</text> | ... | ... |
pages/giftpack/mygiftpack/mygiftpack.wxss
pages/goods/categoryList/categoryList.js
| ... | ... | @@ -819,7 +819,7 @@ Page({ |
| 819 | 819 | // }, |
| 820 | 820 | // 左侧更新 |
| 821 | 821 | scrollLower: function (data) { |
| 822 | - //console.log("上拉加载更多", JSON.stringify(data)) | |
| 822 | + if(this.data.is_no_more) return false; | |
| 823 | 823 | var that = this; |
| 824 | 824 | clearInterval(that.data.timer); |
| 825 | 825 | that.setData({ |
| ... | ... | @@ -843,18 +843,17 @@ Page({ |
| 843 | 843 | }); |
| 844 | 844 | if (e.data.data.pageData.length > 0) { |
| 845 | 845 | s.setData({ |
| 846 | - msgStatus: false, | |
| 846 | + msgStatus: false,is_no_more:0 | |
| 847 | 847 | }); |
| 848 | 848 | //如果有数据 判断分页为第一页的时候直接渲染数据 |
| 849 | 849 | if (page > 1) { |
| 850 | 850 | //如果分页不是在第一页 那么就把返回的数据追加到原有数据后面 |
| 851 | 851 | var arr = s.data.requestData |
| 852 | - console.log("arr:=" + JSON.stringify(arr)) | |
| 853 | - | |
| 852 | + | |
| 854 | 853 | for (var i = 0; i < e.data.data.pageData.length;i++){ |
| 855 | 854 | arr.push(e.data.data.pageData[i]); |
| 856 | 855 | } |
| 857 | - console.log(arr) | |
| 856 | + | |
| 858 | 857 | s.setData({ |
| 859 | 858 | requestData: arr |
| 860 | 859 | }); |
| ... | ... | @@ -875,19 +874,28 @@ Page({ |
| 875 | 874 | if (page != 1) { |
| 876 | 875 | var dataArray = s.data.one_level_classify |
| 877 | 876 | var index = s.data.index |
| 878 | - dataArray[index]['items']['is_show_class'] = false | |
| 879 | - dataArray[index+1]['items']['is_show_class'] = true | |
| 880 | - console.log(dataArray[index + 1]['items']) | |
| 881 | - s.setData({ | |
| 882 | - msgStatus: true, | |
| 883 | - stylePage: 1, | |
| 884 | - index: index + 1, | |
| 885 | - select_classify_on: index + 1, | |
| 886 | - cat_id: dataArray[index + 1]['items']['id'], | |
| 887 | - classify_name: dataArray[index + 1]['items']['name'], | |
| 888 | - one_level_classify: dataArray | |
| 889 | - }); | |
| 890 | - s.style(s.data.stylePage, dataArray[index + 1]['items']['id']) | |
| 877 | + dataArray[index]['items']['is_show_class'] = false | |
| 878 | + //没有下一个类别的时候 | |
| 879 | + if(index+1>=dataArray.length){ | |
| 880 | + s.setData({is_no_more:1}); | |
| 881 | + }else{ | |
| 882 | + dataArray[index+1]['items']['is_show_class'] = true | |
| 883 | + console.log(dataArray[index + 1]['items']) | |
| 884 | + s.setData({ | |
| 885 | + msgStatus: true, | |
| 886 | + stylePage: 1, | |
| 887 | + index: index + 1, | |
| 888 | + select_classify_on: index + 1, | |
| 889 | + cat_id: dataArray[index + 1]['items']['id'], | |
| 890 | + classify_name: dataArray[index + 1]['items']['name'], | |
| 891 | + one_level_classify: dataArray, | |
| 892 | + is_no_more:0 | |
| 893 | + }); | |
| 894 | + s.style(s.data.stylePage, dataArray[index + 1]['items']['id']) | |
| 895 | + } | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 891 | 899 | }else{ |
| 892 | 900 | //没有数据而且是第一页的时候 |
| 893 | 901 | s.setData({ |
| ... | ... | @@ -897,7 +905,8 @@ Page({ |
| 897 | 905 | s.setData({ |
| 898 | 906 | msgStatus: true, |
| 899 | 907 | countDownNum: countDownNum, |
| 900 | - requestData: [] | |
| 908 | + requestData: [], | |
| 909 | + is_no_more:0, | |
| 901 | 910 | }); |
| 902 | 911 | s.data.timer=setInterval(function () { |
| 903 | 912 | if (countDownNum == 0) { |
| ... | ... | @@ -1012,6 +1021,12 @@ Page({ |
| 1012 | 1021 | if(!url || url=='') return; |
| 1013 | 1022 | if(url[0]!='/') url='/'+url; |
| 1014 | 1023 | getApp().goto(url); |
| 1024 | + }, | |
| 1025 | + | |
| 1026 | + onShareTimeline(){ | |
| 1027 | + return { | |
| 1028 | + title:'商品分类-'+getApp().globalData.config.store_name, | |
| 1029 | + } | |
| 1015 | 1030 | } |
| 1016 | 1031 | |
| 1017 | 1032 | }); |
| 1018 | 1033 | \ No newline at end of file | ... | ... |
pages/goods/categoryList/categoryList.wxml
| ... | ... | @@ -493,6 +493,9 @@ |
| 493 | 493 | </block> |
| 494 | 494 | </view> |
| 495 | 495 | </navigator> |
| 496 | + <!-- 暂无更多 --> | |
| 497 | + <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" | |
| 498 | + wx:if="{{is_no_more}}">暂无更多</view> | |
| 496 | 499 | </view> |
| 497 | 500 | <view class="no-data" wx:if="{{msgStatus == true}}"> |
| 498 | 501 | <!-- <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> --> |
| ... | ... | @@ -500,8 +503,9 @@ |
| 500 | 503 | <view wx:if="{{msgStatus == true && lastMsg == false}}" class="no-data-title" style="text-align:center;margin-top:100px"> |
| 501 | 504 | <view style="color:#444;line-height:30px;">该类别暂无推荐商品</view><view style="color:#444;line-height:30px;"> {{countDownNum}} 秒后自动跳到下一个类别</view> </view> |
| 502 | 505 | <view wx:elif="{{lastMsg == true && msgStatus == true}}" class="no-data-title" style="text-align:center;margin-top:100px">该类别暂无推荐商品</view> |
| 503 | - <!-- <navigator class="lookat" url="/pages/index/index/index"> 去逛逛 </navigator> --> | |
| 506 | + <!-- <navigator class="lookat" url="/pages/index/index/index"> 去逛逛 </navigator> --> | |
| 504 | 507 | </view> |
| 508 | + | |
| 505 | 509 | |
| 506 | 510 | </scroll-view> |
| 507 | 511 | <!-- /goodslist --> | ... | ... |
pages/goods/goodsInfo/buy_integral.wxml
| ... | ... | @@ -11,6 +11,7 @@ |
| 11 | 11 | <text wx:if="{{prom_integral}}">{{prom_integral}}积分</text> |
| 12 | 12 | <text wx:if="{{prom_integral && prom_price}}">+</text> |
| 13 | 13 | <text wx:if="{{prom_price}}">{{prom_price}}元</text> |
| 14 | + <text wx:if="{{!prom_integral && !prom_price}}">0积分</text> | |
| 14 | 15 | </view> |
| 15 | 16 | </view> |
| 16 | 17 | ... | ... |
pages/goods/goodsInfo/g_filter.wxs
| ... | ... | @@ -80,8 +80,38 @@ var g_filters = { |
| 80 | 80 | if(min_name.length>4) min_name=min_name.substring(0, 8); |
| 81 | 81 | return min_name; |
| 82 | 82 | }, |
| 83 | + | |
| 84 | + toFix: function (val, count,set) { | |
| 85 | + if(val===undefined) return 0; | |
| 86 | + if(val===null) return 0; | |
| 87 | + if(val==='') return 0; | |
| 88 | + val = parseFloat(val); | |
| 89 | + if(set==1 && val==0) return val; | |
| 90 | + return val.toFixed(count) | |
| 91 | + }, | |
| 92 | + | |
| 93 | + //折扣数值处理，小数位数为1时，只显示1位；小数位数为2时，才显示2位； | |
| 94 | + num: function(value) { | |
| 95 | + if(value != 0) { | |
| 96 | + var val = value.toFixed(2).toString(); | |
| 97 | + if(val.indexOf('.') != -1) { | |
| 98 | + var arrval = val.split('.'); | |
| 99 | + if(arrval[1].length == 1 && arrval[1][0] == 0) { | |
| 100 | + val = val.slice(0,-2); | |
| 101 | + }; | |
| 102 | + | |
| 103 | + if(arrval[1].length == 2 && arrval[1][1] == 0) { | |
| 104 | + val = val.slice(0,-1); | |
| 105 | + }; | |
| 106 | + }; | |
| 107 | + return val; | |
| 108 | + } else { | |
| 109 | + return value.toFixed(0); | |
| 110 | + }; | |
| 111 | + }, | |
| 83 | 112 | } |
| 84 | 113 | module.exports = { |
| 85 | 114 | is_has_rank:g_filters.is_has_rank, |
| 86 | - get_card_price:g_filters.get_card_price, | |
| 115 | + get_card_price:g_filters.get_card_price, | |
| 116 | + num:g_filters.num, | |
| 87 | 117 | } |
| 88 | 118 | \ No newline at end of file | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -261,10 +261,10 @@ Page({ |
| 261 | 261 | room_user_share=t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id |
| 262 | 262 | |
| 263 | 263 | //-- 自定义海报 -- |
| 264 | - getApp().request.promiseGet("/api/weshop/goods/poster/page",{ | |
| 265 | - data:{store_id:os.stoid, type:1, is_use:1 } | |
| 264 | + getApp().request.promiseGet("/api/weshop/goods/poster/page", { | |
| 265 | + data:{store_id:os.stoid, type:1, is_use:1} | |
| 266 | 266 | }).then(res=>{ |
| 267 | - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ | |
| 267 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){ | |
| 268 | 268 | |
| 269 | 269 | var poster_data=res.data.data.pageData[0]; |
| 270 | 270 | var json_str=poster_data.jsonStr; |
| ... | ... | @@ -314,7 +314,6 @@ Page({ |
| 314 | 314 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ |
| 315 | 315 | if(res.data.code==0){ |
| 316 | 316 | getApp().globalData.guide_id=res.data.data.id; |
| 317 | - console.log("log2---".getApp().globalData.guide_id); | |
| 318 | 317 | } |
| 319 | 318 | }) |
| 320 | 319 | } |
| ... | ... | @@ -700,7 +699,25 @@ Page({ |
| 700 | 699 | ee.check_is_youhui(ee.data.gid); |
| 701 | 700 | |
| 702 | 701 | t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); |
| 703 | - var txt = (t.data.data.shop_price / t.data.data.market_price * 10).toFixed(2); | |
| 702 | + var txt = (t.data.data.shop_price / t.data.data.market_price * 10).toFixed(2).toString(); | |
| 703 | + | |
| 704 | + | |
| 705 | + if(txt != 0) { | |
| 706 | + if(txt.indexOf('.') != -1) { | |
| 707 | + var arrtxt = txt.split('.'); | |
| 708 | + if(arrtxt[1].length == 1 && arrtxt[1][0] == 0) { | |
| 709 | + txt = txt.slice(0,-2); | |
| 710 | + }; | |
| 711 | + | |
| 712 | + if(arrtxt[1].length == 2 && arrtxt[1][1] == 0) { | |
| 713 | + txt = txt.slice(0,-1); | |
| 714 | + }; | |
| 715 | + }; | |
| 716 | + } else { | |
| 717 | + txt = 0; | |
| 718 | + } | |
| 719 | + | |
| 720 | + | |
| 704 | 721 | t.data.data['disc'] = txt; |
| 705 | 722 | |
| 706 | 723 | if (t.data.data.original_img.indexOf(o.imghost) == -1) |
| ... | ... | @@ -843,7 +860,11 @@ Page({ |
| 843 | 860 | url: "/pages/user/address_list/address_list?operate=selectAddress" |
| 844 | 861 | }); |
| 845 | 862 | }, |
| 846 | - onUnload: function() {}, | |
| 863 | + onUnload: function() { | |
| 864 | + for(var i = 1; i < 100; i++) { | |
| 865 | + clearInterval(i); | |
| 866 | + } | |
| 867 | + }, | |
| 847 | 868 | onHide: function() { |
| 848 | 869 | this.data.is_timer = 0; |
| 849 | 870 | for(var i = 1; i < 100; i++) { |
| ... | ... | @@ -2094,7 +2115,7 @@ Page({ |
| 2094 | 2115 | if (e.data.code == 0) { |
| 2095 | 2116 | |
| 2096 | 2117 | //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 |
| 2097 | - if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig.is_sort_storage){ | |
| 2118 | + if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){ | |
| 2098 | 2119 | th.setData({ |
| 2099 | 2120 | def_pick_store:e.data.data.pageData[0], |
| 2100 | 2121 | sto_sele_name: e.data.data.pageData[0].pickup_name, |
| ... | ... | @@ -2283,7 +2304,7 @@ Page({ |
| 2283 | 2304 | only_pk: e.data.data.pageData |
| 2284 | 2305 | }); |
| 2285 | 2306 | //-----如果没有默认门店，要取第一个门店作为默认店------ |
| 2286 | - if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { | |
| 2307 | + if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { | |
| 2287 | 2308 | th.setData({ |
| 2288 | 2309 | def_pick_store:e.data.data.pageData[0], |
| 2289 | 2310 | sto_sele_name: e.data.data.pageData[0].pickup_name, |
| ... | ... | @@ -2765,15 +2786,17 @@ Page({ |
| 2765 | 2786 | } |
| 2766 | 2787 | }).then(res => { |
| 2767 | 2788 | var now = ut.gettimestamp(); |
| 2768 | - var tgr = res.data.data.pageData[0]; | |
| 2769 | - //如果团的时间已经到了 | |
| 2770 | - if (now >= tgr.kt_end_time) { | |
| 2771 | - th.update_jiti(tgr.id); | |
| 2772 | - } else { | |
| 2773 | - th.setData({ | |
| 2774 | - user_order_pt_state: 2 | |
| 2775 | - }); | |
| 2776 | - } | |
| 2789 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 2790 | + var tgr = res.data.data.pageData[0]; | |
| 2791 | + //如果团的时间已经到了 | |
| 2792 | + if (now >= tgr.kt_end_time) { | |
| 2793 | + th.update_jiti(tgr.id); | |
| 2794 | + } else { | |
| 2795 | + th.setData({ | |
| 2796 | + user_order_pt_state: 2 | |
| 2797 | + }); | |
| 2798 | + } | |
| 2799 | + } | |
| 2777 | 2800 | }) |
| 2778 | 2801 | |
| 2779 | 2802 | } else { |
| ... | ... | @@ -3110,7 +3133,12 @@ Page({ |
| 3110 | 3133 | } |
| 3111 | 3134 | }); |
| 3112 | 3135 | } else if (odr.pt_status == 1 && odr.order_status == 1) { |
| 3113 | - wx.navigateTo({ | |
| 3136 | + | |
| 3137 | + if(this.data.is_go_to_team_show) return false; | |
| 3138 | + this.data.is_go_to_team_show=1; | |
| 3139 | + wx.showLoading(); | |
| 3140 | + | |
| 3141 | + wx.redirectTo({ | |
| 3114 | 3142 | url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, |
| 3115 | 3143 | }); |
| 3116 | 3144 | } else { |
| ... | ... | @@ -3318,17 +3346,24 @@ Page({ |
| 3318 | 3346 | |
| 3319 | 3347 | //-------跳转pt商品------- |
| 3320 | 3348 | go_to_nopay: function() { |
| 3321 | - var th = this; | |
| 3322 | - wx.navigateTo({ | |
| 3323 | - url: "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id, | |
| 3324 | - }); | |
| 3349 | + var th = this; | |
| 3350 | + url="/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; | |
| 3351 | + getApp().goto(url); | |
| 3352 | + | |
| 3325 | 3353 | }, |
| 3326 | 3354 | //-------跳转pt teamshow------- |
| 3327 | 3355 | go_to_team_show: function() { |
| 3328 | - var th = this; | |
| 3329 | - wx.navigateTo({ | |
| 3330 | - url: "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn, | |
| 3331 | - }); | |
| 3356 | + | |
| 3357 | + if(this.data.is_go_to_team_show) return false; | |
| 3358 | + this.data.is_go_to_team_show=1; | |
| 3359 | + wx.showLoading(); | |
| 3360 | + | |
| 3361 | + var th = this; | |
| 3362 | + var url="/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; | |
| 3363 | + wx.redirectTo({ | |
| 3364 | + url:url, | |
| 3365 | + }) | |
| 3366 | + | |
| 3332 | 3367 | }, |
| 3333 | 3368 | |
| 3334 | 3369 | //---拼团倒计时--- |
| ... | ... | @@ -3408,9 +3443,14 @@ Page({ |
| 3408 | 3443 | } |
| 3409 | 3444 | }); |
| 3410 | 3445 | } else if (odr.pt_status == 1 && odr.order_status == 1) { |
| 3411 | - wx.navigateTo({ | |
| 3412 | - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | |
| 3413 | - }); | |
| 3446 | + | |
| 3447 | + if(this.data.is_go_to_team_show) return false; | |
| 3448 | + this.data.is_go_to_team_show=1; | |
| 3449 | + wx.showLoading(); | |
| 3450 | + | |
| 3451 | + wx.redirectTo({ | |
| 3452 | + url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | |
| 3453 | + }); | |
| 3414 | 3454 | } else { |
| 3415 | 3455 | wx.navigateTo({ |
| 3416 | 3456 | url: "/pages/team/team_show/team_show?tg_id=" + id, |
| ... | ... | @@ -3587,6 +3627,12 @@ Page({ |
| 3587 | 3627 | 'store_id': os.stoid, |
| 3588 | 3628 | 'type': 5 |
| 3589 | 3629 | }; |
| 3630 | + | |
| 3631 | + //-- 导购ID -- | |
| 3632 | + if(getApp().globalData.guide_id){ | |
| 3633 | + pdata.guide_id=getApp().globalData.guide_id; | |
| 3634 | + } | |
| 3635 | + | |
| 3590 | 3636 | var app = getApp(), |
| 3591 | 3637 | th = this; |
| 3592 | 3638 | app.request.post("/api/weshop/couponList/saveCouponList", { |
| ... | ... | @@ -3641,14 +3687,14 @@ Page({ |
| 3641 | 3687 | var unit = that.data.screenWidth / 750 * 1.35; //基础单位， |
| 3642 | 3688 | var path2 = that.data.data.original_img; |
| 3643 | 3689 | var scene = th.data.gid+""; |
| 3644 | - var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0; | |
| 3645 | - if(user_id>0){ | |
| 3690 | + var user_id = getApp().globalData.user_id?getApp().globalData.user_id:0; | |
| 3691 | + if(user_id>0) { | |
| 3646 | 3692 | scene+="_"+user_id; |
| 3647 | 3693 | } |
| 3648 | 3694 | //-- 如果不是会员分享过来的要分享给别人 -- |
| 3649 | - if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share){ | |
| 3695 | + if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) { | |
| 3650 | 3696 | //固定房间是第3个字符 |
| 3651 | - if(!user_id) scene+="_0"; | |
| 3697 | + if(!user_id) scene+="_0"; | |
| 3652 | 3698 | scene+="_"+getApp().globalData.room_id ; |
| 3653 | 3699 | } |
| 3654 | 3700 | ///二微码 |
| ... | ... | @@ -3678,7 +3724,7 @@ Page({ |
| 3678 | 3724 | context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); |
| 3679 | 3725 | |
| 3680 | 3726 | //-- 是自定义海报的情况下 -- |
| 3681 | - if(th.data.poster && parseInt(th.data.poster.style)==2){ | |
| 3727 | + if(th.data.poster && parseInt(th.data.poster.style)==2) { | |
| 3682 | 3728 | //在线上分享人的情况下 |
| 3683 | 3729 | if(parseInt(th.data.poster.show_headpic)){ |
| 3684 | 3730 | //获取坐标 |
| ... | ... | @@ -3697,9 +3743,13 @@ Page({ |
| 3697 | 3743 | context.setFontSize(16 * unit) |
| 3698 | 3744 | context.setLineJoin('round'); //交点设置成圆角 |
| 3699 | 3745 | context.setFillStyle("white") |
| 3700 | - context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); | |
| 3746 | + context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); | |
| 3747 | + | |
| 3748 | + context.setFillStyle("black") | |
| 3749 | + context.setFontSize(24 * unit) | |
| 3750 | + context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit); | |
| 3701 | 3751 | } |
| 3702 | - }else{ | |
| 3752 | + } else { | |
| 3703 | 3753 | //--昵称--- |
| 3704 | 3754 | context.setFontSize(24 * unit) |
| 3705 | 3755 | context.setFillStyle("black") |
| ... | ... | @@ -3708,9 +3758,9 @@ Page({ |
| 3708 | 3758 | //强烈推荐 改许程 |
| 3709 | 3759 | var tj_path = "../../../images/share/q_tj.png"; |
| 3710 | 3760 | context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); |
| 3711 | - context.setFontSize(16 * unit) | |
| 3761 | + context.setFontSize(16 * unit); | |
| 3712 | 3762 | context.setLineJoin('round'); //交点设置成圆角 |
| 3713 | - context.setFillStyle("white") | |
| 3763 | + context.setFillStyle("white"); | |
| 3714 | 3764 | context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); |
| 3715 | 3765 | } |
| 3716 | 3766 | |
| ... | ... | @@ -3746,7 +3796,7 @@ Page({ |
| 3746 | 3796 | context.setFillStyle("black"); |
| 3747 | 3797 | context.setFontSize(21.3 * unit) |
| 3748 | 3798 | th.draw_Text(context, th.data.data.goods_name, |
| 3749 | - 38 * unit, 180 * unit, 20 * unit, 300*unit, unit); | |
| 3799 | + 38 * unit, 170 * unit, 20 * unit, 300*unit, unit); | |
| 3750 | 3800 | //------ 产品的价格 ----- |
| 3751 | 3801 | var pri0 = th.data.prom_act.addmoney; |
| 3752 | 3802 | var integral=th.data.prom_act.integral; |
| ... | ... | @@ -3754,14 +3804,15 @@ Page({ |
| 3754 | 3804 | if(integral){text=integral+"积分"; } |
| 3755 | 3805 | if(pri0 && integral){ text+="+";} |
| 3756 | 3806 | if(pri0){ text+="￥"+pri0;} |
| 3757 | - | |
| 3807 | + | |
| 3808 | + if(!pri0 && !integral){ text="0积分";} | |
| 3758 | 3809 | context.setFillStyle("red"); |
| 3759 | - context.fillText(text, 38 * unit, 215 * unit); | |
| 3810 | + context.fillText(text, 38 * unit, 235 * unit); | |
| 3760 | 3811 | |
| 3761 | 3812 | } |
| 3762 | 3813 | |
| 3763 | 3814 | //---中间大图--- |
| 3764 | - context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit); | |
| 3815 | + context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit); | |
| 3765 | 3816 | //-------大图后面就不一样了----------- |
| 3766 | 3817 | switch (type) { |
| 3767 | 3818 | case 0: //普通商品的展示 |
| ... | ... | @@ -3805,23 +3856,33 @@ Page({ |
| 3805 | 3856 | } |
| 3806 | 3857 | |
| 3807 | 3858 | |
| 3808 | - //---画线--- | |
| 3809 | - context.setLineWidth(1 * unit) | |
| 3810 | - context.moveTo(32 * unit, 710 * unit) | |
| 3811 | - context.lineTo(520 * unit, 710 * unit) | |
| 3812 | - context.stroke(); | |
| 3813 | - //---文字--- | |
| 3814 | - context.setFillStyle("black") | |
| 3815 | - context.setFontSize(22 * unit) | |
| 3859 | + //---画线--- | |
| 3860 | + context.setLineWidth(1 * unit) | |
| 3861 | + context.moveTo(32 * unit, 710 * unit) | |
| 3862 | + context.lineTo(520 * unit, 710 * unit) | |
| 3863 | + context.stroke(); | |
| 3864 | + | |
| 3865 | + //---文字--- | |
| 3866 | + context.setFillStyle("black") | |
| 3867 | + context.setFontSize(22 * unit) | |
| 3816 | 3868 | |
| 3817 | 3869 | if(type==0){ |
| 3818 | 3870 | // 原来start ---> |
| 3819 | - context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit); | |
| 3820 | - context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit); | |
| 3871 | + | |
| 3872 | + context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 806 * unit); | |
| 3873 | + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit); | |
| 3874 | + context.setFillStyle("black") | |
| 3875 | + context.setFontSize(28 * unit) | |
| 3876 | + context.fillText(th.data.sto_sele_name, 40 * unit, 766 * unit); | |
| 3821 | 3877 | }else{ |
| 3822 | - // 原来start ---> | |
| 3823 | - context.fillText("长按识别二维码", 40 * unit, 776 * unit); | |
| 3824 | - context.fillText("立即开始兑换", 40 * unit, 826 * unit); | |
| 3878 | + // 原来start ---> | |
| 3879 | + // context.fillText("长按识别二维码", 40 * unit, 776 * unit); | |
| 3880 | + // context.fillText("立即开始兑换", 40 * unit, 826 * unit); | |
| 3881 | + context.fillText("长按识别二维码", 40 * unit, 806 * unit); | |
| 3882 | + context.fillText("立即开始兑换", 40 * unit, 846 * unit); | |
| 3883 | + context.setFillStyle("black") | |
| 3884 | + context.setFontSize(28 * unit) | |
| 3885 | + context.fillText(th.data.sto_sele_name, 40 * unit, 766 * unit); | |
| 3825 | 3886 | } |
| 3826 | 3887 | |
| 3827 | 3888 | //---二维吗图--- |
| ... | ... | @@ -3850,8 +3911,11 @@ Page({ |
| 3850 | 3911 | //---文字--- |
| 3851 | 3912 | context.setFontSize(22 * unit) |
| 3852 | 3913 | context.setFillStyle("black") |
| 3853 | - context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit); | |
| 3854 | - context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit); | |
| 3914 | + context.fillText("特惠好物，限时秒杀", 40 * unit, 826 * unit); | |
| 3915 | + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * unit); | |
| 3916 | + context.setFillStyle("black") | |
| 3917 | + context.setFontSize(28 * unit) | |
| 3918 | + context.fillText(th.data.sto_sele_name, 40 * unit, 786 * unit); | |
| 3855 | 3919 | //---二维吗图--- |
| 3856 | 3920 | //-- 自定义海报 -- |
| 3857 | 3921 | if(th.data.poster){ |
| ... | ... | @@ -3891,11 +3955,14 @@ Page({ |
| 3891 | 3955 | context.setFontSize(22 * unit) |
| 3892 | 3956 | context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit); |
| 3893 | 3957 | context.setFillStyle("gray") |
| 3894 | - context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit); | |
| 3958 | + context.fillText("快来和我一起拼团吧！", 40 * unit, 836 * unit); | |
| 3895 | 3959 | context.setFillStyle("black") |
| 3896 | 3960 | context.font = 'normal bold 18px sans-serif'; |
| 3897 | 3961 | context.setFontSize(21.3 * unit) |
| 3898 | - context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit); | |
| 3962 | + context.fillText("长按识别二维码，立即参团", 40 * unit, 866 * unit); | |
| 3963 | + context.setFillStyle("black") | |
| 3964 | + context.setFontSize(26 * unit) | |
| 3965 | + context.fillText(th.data.sto_sele_name, 40 * unit, 806 * unit); | |
| 3899 | 3966 | //---二维吗图--- |
| 3900 | 3967 | //-- 自定义海报 -- |
| 3901 | 3968 | if(th.data.poster){ |
| ... | ... | @@ -3934,12 +4001,22 @@ Page({ |
| 3934 | 4001 | context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit); |
| 3935 | 4002 | } |
| 3936 | 4003 | //----------------下面部分---------------- |
| 4004 | + // context.setFillStyle("gray") | |
| 4005 | + // context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit); | |
| 4006 | + // context.setFillStyle("black") | |
| 4007 | + // context.font = 'normal bold 18px sans-serif'; | |
| 4008 | + // context.setFontSize(22 * unit) | |
| 4009 | + // context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); | |
| 3937 | 4010 | context.setFillStyle("gray") |
| 3938 | - context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit); | |
| 4011 | + context.fillText("快来和我一起拼团吧！", 40 * unit, 810 * unit); | |
| 3939 | 4012 | context.setFillStyle("black") |
| 3940 | 4013 | context.font = 'normal bold 18px sans-serif'; |
| 3941 | 4014 | context.setFontSize(22 * unit) |
| 3942 | - context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); | |
| 4015 | + context.fillText("长按识别二维码，立即参团", 40 * unit, 840 * unit); | |
| 4016 | + | |
| 4017 | + context.setFillStyle("black") | |
| 4018 | + context.setFontSize(26 * unit) | |
| 4019 | + context.fillText(th.data.sto_sele_name, 40 * unit, 876 * unit); | |
| 3943 | 4020 | |
| 3944 | 4021 | //-- 自定义海报 -- |
| 3945 | 4022 | if(th.data.poster){ |
| ... | ... | @@ -4241,7 +4318,7 @@ Page({ |
| 4241 | 4318 | } |
| 4242 | 4319 | |
| 4243 | 4320 | |
| 4244 | - if (bconfig.is_sort_storage) { | |
| 4321 | + if (bconfig && bconfig.is_sort_storage) { | |
| 4245 | 4322 | wx.getLocation({ |
| 4246 | 4323 | type: 'gcj02', |
| 4247 | 4324 | success: function(res) { |
| ... | ... | @@ -4582,7 +4659,7 @@ Page({ |
| 4582 | 4659 | var t_time = setInterval(function() { |
| 4583 | 4660 | if (th.data.bconfig == null) false; |
| 4584 | 4661 | var e = th.data.bconfig; |
| 4585 | - if (e.is_sort_storage) { | |
| 4662 | + if (e && e.is_sort_storage) { | |
| 4586 | 4663 | wx.getLocation({ |
| 4587 | 4664 | type: 'gcj02', |
| 4588 | 4665 | success: function(res) { |
| ... | ... | @@ -4889,6 +4966,18 @@ Page({ |
| 4889 | 4966 | |
| 4890 | 4967 | addCart_inte:function(t){ |
| 4891 | 4968 | this.add_cart_func_inte(t); |
| 4892 | - } | |
| 4969 | + }, | |
| 4970 | + | |
| 4971 | + | |
| 4972 | + | |
| 4973 | + | |
| 4974 | + onShareTimeline() { | |
| 4975 | + return { | |
| 4976 | + title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name, | |
| 4977 | + imageUrl:this.data.gallery[0].image_url, | |
| 4978 | + } | |
| 4979 | + }, | |
| 4980 | + | |
| 4981 | + | |
| 4893 | 4982 | |
| 4894 | 4983 | }); | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -177,6 +177,7 @@ |
| 177 | 177 | <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团 </text> |
| 178 | 178 | <view class="t_show"> |
| 179 | 179 | 剩余 |
| 180 | + <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text> | |
| 180 | 181 | <text>{{timer[t_ind].hou}}</text>: |
| 181 | 182 | <text>{{timer[t_ind].min}}</text>: |
| 182 | 183 | <text>{{timer[t_ind].sec}}</text> |
| ... | ... | @@ -235,12 +236,13 @@ |
| 235 | 236 | <view class="goods-price rel"> |
| 236 | 237 | <!-- 价格显示 --> |
| 237 | 238 | <view class="co-red" style="overflow: hidden" > |
| 238 | - <view class="market-price" style="overflow: hidden"> | |
| 239 | + <view class="market-price" style="overflow: hidden; height: 66rpx;"> | |
| 239 | 240 | <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image> |
| 240 | 241 | <block wx:if="{{prom_integral}}">{{prom_integral}} |
| 241 | 242 | <text class="rel_txt">积分</text></block> |
| 242 | 243 | <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text> |
| 243 | - <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> | |
| 244 | + <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> | |
| 245 | + <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text> | |
| 244 | 246 | <text class="rel_txt" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;"> 零售价:￥{{data.market_price}}</text> |
| 245 | 247 | </view> |
| 246 | 248 | </view> |
| ... | ... | @@ -257,7 +259,8 @@ |
| 257 | 259 | |
| 258 | 260 | <view class="goods-num"> |
| 259 | 261 | <view class="sales">销量：{{prom_act.buy_num}}件</view> |
| 260 | - <view class="stock">折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折</view> | |
| 262 | + <!-- <view class="stock">折扣：{{data.disc}}折</view> --> | |
| 263 | + <view class="stock">折扣：{{g_filters.num((prom_price?prom_price:0)*100/data.shop_price)}}折</view> | |
| 261 | 264 | <view class="stock">{{categories3[0].num}}人评价</view> |
| 262 | 265 | </view> |
| 263 | 266 | </view> |
| ... | ... | @@ -364,6 +367,7 @@ |
| 364 | 367 | <view class="goods-num" wx:if="{{prom_type!=1}}"> |
| 365 | 368 | <view class="sales">销量：{{data.sales_sum}}件</view> |
| 366 | 369 | <view class="stock">折扣：{{data.disc}}折</view> |
| 370 | + <!-- <view class="stock">折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折</view> --> | |
| 367 | 371 | <view class="stock">{{categories3[0].num}}人评价</view> |
| 368 | 372 | </view> |
| 369 | 373 | <view wx:if="{{prom_type==1}}"> |
| ... | ... | @@ -1424,14 +1428,15 @@ |
| 1424 | 1428 | |
| 1425 | 1429 | <view wx:if="{{showPoster}}" class="poster-container"> |
| 1426 | 1430 | <view class="poster-wrapper"> |
| 1427 | - <view class="poster" bindtap="previewImage"> | |
| 1428 | - <image src="{{shareImgPath}}" class="poster-img"></image> | |
| 1431 | + <view class="poster"> | |
| 1432 | + <!-- <view class="poster" bindtap="previewImage"> --> | |
| 1433 | + <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image> | |
| 1429 | 1434 | <view class="btn-close" catchtap="closePoster">x</view> |
| 1430 | 1435 | </view> |
| 1431 | - <view class="btn-container"> | |
| 1436 | + <!-- <view class="btn-container"> | |
| 1432 | 1437 | <button class="btn-share" open-type="share" bindtap="">微信好友分享</button> |
| 1433 | 1438 | <button class="btn-share" bindtap="savePic">保存到相册</button> |
| 1434 | - </view> | |
| 1439 | + </view> --> | |
| 1435 | 1440 | </view> |
| 1436 | 1441 | </view> |
| 1437 | 1442 | ... | ... |
pages/goods/goodsList/goodsList.js
| ... | ... | @@ -128,7 +128,7 @@ Page({ |
| 128 | 128 | //-- 获取 -- |
| 129 | 129 | await getApp().request.promiseGet("/api/weshop/libao/libaoForm/page?id="+content.libao+"&store_id="+oo.stoid, { |
| 130 | 130 | }).then(res => { |
| 131 | - if(res.data.code==0) | |
| 131 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) | |
| 132 | 132 | arr[i].content.lb_name=res.data.data.pageData[0].lbtitle; |
| 133 | 133 | }) |
| 134 | 134 | } | ... | ... |
pages/goods/search/search.js
| ... | ... | @@ -22,7 +22,12 @@ Page({ |
| 22 | 22 | tabname: "sort", //排序的字段 |
| 23 | 23 | adname: "asc", //升降的字段 |
| 24 | 24 | rq_data:null, |
| 25 | + | |
| 26 | + | |
| 27 | + searchRecord: [], | |
| 28 | + keyword: '', | |
| 25 | 29 | }, |
| 30 | + | |
| 26 | 31 | onLoad: function(t) { |
| 27 | 32 | this.data.rq_data=t; |
| 28 | 33 | |
| ... | ... | @@ -104,6 +109,9 @@ Page({ |
| 104 | 109 | if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;} |
| 105 | 110 | if (url != this.data.baseUrl) return this.requestSearch(url); |
| 106 | 111 | this.openSearchModal(); |
| 112 | + | |
| 113 | + // 获取历史搜索记录 | |
| 114 | + this.getHistorySearch(); | |
| 107 | 115 | }, |
| 108 | 116 | changeTab: function(t) { |
| 109 | 117 | var ord = t.currentTarget.dataset.href; |
| ... | ... | @@ -176,18 +184,23 @@ Page({ |
| 176 | 184 | }); |
| 177 | 185 | }, |
| 178 | 186 | submitSearch: function(t) { |
| 187 | + console.log(111); | |
| 179 | 188 | this.search(t.detail.value.word); |
| 189 | + | |
| 190 | + | |
| 180 | 191 | }, |
| 181 | 192 | |
| 182 | 193 | //热搜关键字 |
| 183 | 194 | searchHotWord: function(t) { |
| 184 | - this.search(t.currentTarget.dataset.word); | |
| 195 | + this.historyRecord(); | |
| 196 | + this.search(t.currentTarget.dataset.word); | |
| 185 | 197 | }, |
| 186 | 198 | |
| 187 | 199 | //-----点击搜索按钮---- |
| 188 | 200 | search: function(t) { |
| 189 | 201 | if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); |
| 190 | 202 | this.data.key_str=t; |
| 203 | + this.historyRecord(); | |
| 191 | 204 | this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); |
| 192 | 205 | }, |
| 193 | 206 | |
| ... | ... | @@ -253,4 +266,56 @@ Page({ |
| 253 | 266 | func(ob); |
| 254 | 267 | }) |
| 255 | 268 | }, |
| 269 | + | |
| 270 | + | |
| 271 | + getInput(e) { | |
| 272 | + this.setData({ | |
| 273 | + keyword: e.detail.value | |
| 274 | + }); | |
| 275 | + }, | |
| 276 | + | |
| 277 | + historyRecord() { | |
| 278 | + let self = this; | |
| 279 | + let keyword = this.data.key_str; | |
| 280 | + let searchRecord = this.data.searchRecord; | |
| 281 | + | |
| 282 | + if(keyword) { | |
| 283 | + if(searchRecord.indexOf(keyword) > -1) { | |
| 284 | + // 已经存在该值 | |
| 285 | + return; | |
| 286 | + } else { | |
| 287 | + if(searchRecord.length >= 10) { | |
| 288 | + searchRecord.pop(); // 删除最早的一条记录 | |
| 289 | + }; | |
| 290 | + searchRecord.unshift(keyword); | |
| 291 | + | |
| 292 | + // // 将历史记录添加到缓存中 | |
| 293 | + wx.setStorage({ | |
| 294 | + key: 'searchRecord', | |
| 295 | + data: searchRecord, | |
| 296 | + success: function(res) { | |
| 297 | + self.setData({ | |
| 298 | + searchRecord, | |
| 299 | + }) | |
| 300 | + } | |
| 301 | + }) | |
| 302 | + }; | |
| 303 | + }; | |
| 304 | + }, | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + getHistorySearch() { | |
| 310 | + this.setData({ | |
| 311 | + searchRecord: wx.getStorageSync('searchRecord') || [] //若无存储则为空 | |
| 312 | + }); | |
| 313 | + }, | |
| 314 | + | |
| 315 | + clearSearchRecord() { | |
| 316 | + wx.clearStorageSync('searchRecord'); | |
| 317 | + this.setData({ | |
| 318 | + searchRecord: [] | |
| 319 | + }); | |
| 320 | + }, | |
| 256 | 321 | }); |
| 257 | 322 | \ No newline at end of file | ... | ... |
pages/goods/search/search.wxml
| ... | ... | @@ -162,7 +162,7 @@ |
| 162 | 162 | <view class="search-modal"> |
| 163 | 163 | <view class="search-bar"> |
| 164 | 164 | <form bindsubmit="submitSearch"> |
| 165 | - <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input> | |
| 165 | + <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindinput="getInput"></input> | |
| 166 | 166 | <button class="search-btn" formType="submit"> |
| 167 | 167 | <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image> |
| 168 | 168 | </button> |
| ... | ... | @@ -176,5 +176,17 @@ |
| 176 | 176 | </view> |
| 177 | 177 | </block> |
| 178 | 178 | </view> |
| 179 | + <view class="search-hot"> | |
| 180 | + <view class="hot-title flex jc_sb ai_c"> | |
| 181 | + <text>历史搜索</text> | |
| 182 | + <text class="iconfont icon-shanchu xc-ash" bindtap="clearSearchRecord" wx:if="{{searchRecord.length != 0}}"></text> | |
| 183 | + </view> | |
| 184 | + <block wx:if="{{searchRecord.length>0}}"> | |
| 185 | + <view class="hot-row flex flex-wrap" wx:key="{{index}}"> | |
| 186 | + <view class="hot-item history ellipsis-1" bindtap="searchHotWord" data-word="{{item}}" wx:for="{{searchRecord}}" wx:key="{{index}}">{{item}}</view> | |
| 187 | + </view> | |
| 188 | + </block> | |
| 189 | + <view wx:else class="fs24">暂无历史搜索记录</view> | |
| 190 | + </view> | |
| 179 | 191 | </view> |
| 180 | 192 | </view> |
| 181 | 193 | \ No newline at end of file | ... | ... |
pages/goods/search/search.wxss
pages/index/index/index.js
| ... | ... | @@ -85,7 +85,7 @@ Page({ |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | if(first_leader){ |
| 88 | - //-- user_id代过来免登陆 -- | |
| 88 | + //-- user_id代过来免登录 -- | |
| 89 | 89 | getApp().globalData.first_leader=first_leader; |
| 90 | 90 | //调用接口判断是不是会员 |
| 91 | 91 | getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ |
| ... | ... | @@ -478,6 +478,9 @@ Page({ |
| 478 | 478 | this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(), |
| 479 | 479 | this.requestRecommend(); |
| 480 | 480 | }, |
| 481 | + requestRecommend(){}, | |
| 482 | + requestHomePage(){}, | |
| 483 | + | |
| 481 | 484 | onUnload: function() { |
| 482 | 485 | this.destroyActivityTimer(); |
| 483 | 486 | }, |
| ... | ... | @@ -884,7 +887,17 @@ Page({ |
| 884 | 887 | }, |
| 885 | 888 | |
| 886 | 889 | |
| 887 | - | |
| 890 | + onShareTimeline() { | |
| 891 | + // getApp().getConfig(function(t) { | |
| 892 | + // return { | |
| 893 | + // title: '首页-' + getApp().globalData.config.store_name, | |
| 894 | + // } | |
| 895 | + // }); | |
| 896 | + | |
| 897 | + return { | |
| 898 | + title: '首页-' + getApp().globalData.config.store_name, | |
| 899 | + } | |
| 900 | + }, | |
| 888 | 901 | |
| 889 | 902 | |
| 890 | 903 | }); |
| 891 | 904 | \ No newline at end of file | ... | ... |
pages/index/index/index.json
| 1 | -{ | |
| 2 | - | |
| 1 | +{ | |
| 3 | 2 | "usingComponents": { |
| 4 | 3 | "goods_recommend":"/components/goods_list/goods_list", |
| 5 | 4 | "nav": "/components/diy_nav/diy_nav", |
| ... | ... | @@ -17,6 +16,8 @@ |
| 17 | 16 | "assist":"/components/diy_assist/diy_assist", |
| 18 | 17 | "picMax": "/components/diy_picMax/diy_picMax", |
| 19 | 18 | "mvideo": "/components/diy_video/diy_video", |
| 20 | - "service": "/components/diy_service/diy_service" | |
| 21 | - } | |
| 19 | + "service": "/components/diy_service/diy_service", | |
| 20 | + "scan": "/components/diy_scan/diy_scan" | |
| 21 | + }, | |
| 22 | + "enablePullDownRefresh": false | |
| 22 | 23 | } |
| 23 | 24 | \ No newline at end of file | ... | ... |
pages/index/index/index.wxml
| ... | ... | @@ -348,6 +348,10 @@ |
| 348 | 348 | <!--在线上客服--> |
| 349 | 349 | <block wx:if="{{item.ename=='onlineService'}}"> |
| 350 | 350 | <service object="{{item.content}}"></service> |
| 351 | + </block> | |
| 352 | + <!--扫一扫--> | |
| 353 | + <block wx:if="{{item.ename=='scan'}}"> | |
| 354 | + <scan object="{{item.content}}"></scan> | |
| 351 | 355 | </block> |
| 352 | 356 | |
| 353 | 357 | </view> | ... | ... |
pages/team/team_more/team_more.js
| ... | ... | @@ -112,6 +112,8 @@ Page({ |
| 112 | 112 | // 获取当前时间，同时得到活动结束时间数组 |
| 113 | 113 | var newTime = ut.gettimestamp(); |
| 114 | 114 | var List = this.data.teamgroup; |
| 115 | + if(!List || List.length<=0) return false; | |
| 116 | + | |
| 115 | 117 | for (var j = 0; j < List.length; j++) { |
| 116 | 118 | // 对结束时间进行处理渲染到页面 |
| 117 | 119 | var endTime = List[j].kt_end_time; | ... | ... |
pages/team/team_more/team_more.wxml
| ... | ... | @@ -17,7 +17,9 @@ |
| 17 | 17 | <text class='gred' wx:else>还差{{pt_act.ct_num - item.open_num}}人成团</text> |
| 18 | 18 | <view> |
| 19 | 19 | <view class="time_show_view"> |
| 20 | - 剩余<text>{{item.djs.hou}}</text>: | |
| 20 | + 剩余 | |
| 21 | + <text wx:if="{{item.djs.day}}">{{item.djs.day}}天:</text> | |
| 22 | + <text>{{item.djs.hou}}</text>: | |
| 21 | 23 | <text>{{item.djs.min}}</text>: |
| 22 | 24 | <text>{{item.djs.sec}}</text>结束 |
| 23 | 25 | </view> | ... | ... |
pages/team/team_show/team_show.js
| ... | ... | @@ -363,24 +363,31 @@ Page({ |
| 363 | 363 | //获取活动从表信息team_id,listno团编号（券号） |
| 364 | 364 | await getApp().request.promiseGet("/api/weshop/teamgroup/get/"+os.stoid+"/"+tg_id, { |
| 365 | 365 | }).then(res => { |
| 366 | - teamgroup = res.data.data; | |
| 367 | - //获取当前时间,并且判断剩余时间 | |
| 368 | - var nt = ut.gettimestamp(); | |
| 369 | - var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); | |
| 370 | - ee.setData({ | |
| 371 | - pindGoods: teamgroup, | |
| 372 | - buy_start_date: buy_start_date | |
| 373 | - }); | |
| 374 | - | |
| 375 | - if(nt>teamgroup.kt_end_time) { | |
| 376 | - th.setData({is_group_end:1,end_text:"团期已经结束"}) | |
| 377 | - } | |
| 378 | - if(teamgroup.state==1) { | |
| 379 | - th.setData({is_group_end:1,end_text:"团期已经结束"}) | |
| 380 | - } | |
| 381 | - if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) { | |
| 382 | - th.setData({is_group_end:2,end_text:"团期已满"}) | |
| 383 | - } | |
| 366 | + | |
| 367 | + | |
| 368 | + if(res.data.code==0 && res.data && res.data.data ) { | |
| 369 | + | |
| 370 | + teamgroup = res.data.data; | |
| 371 | + | |
| 372 | + //获取当前时间,并且判断剩余时间 | |
| 373 | + var nt = ut.gettimestamp(); | |
| 374 | + var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); | |
| 375 | + ee.setData({ | |
| 376 | + pindGoods: teamgroup, | |
| 377 | + buy_start_date: buy_start_date | |
| 378 | + }); | |
| 379 | + | |
| 380 | + if(nt>teamgroup.kt_end_time) { | |
| 381 | + th.setData({is_group_end:1,end_text:"团期已经结束"}) | |
| 382 | + } | |
| 383 | + if(teamgroup.state==1) { | |
| 384 | + th.setData({is_group_end:1,end_text:"团期已经结束"}) | |
| 385 | + } | |
| 386 | + if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) { | |
| 387 | + th.setData({is_group_end:2,end_text:"团期已满"}) | |
| 388 | + } | |
| 389 | + | |
| 390 | + } | |
| 384 | 391 | |
| 385 | 392 | }) |
| 386 | 393 | |
| ... | ... | @@ -969,7 +976,7 @@ Page({ |
| 969 | 976 | return false; |
| 970 | 977 | } |
| 971 | 978 | |
| 972 | - if (bconfig.is_sort_storage) { | |
| 979 | + if ( bconfig && bconfig.is_sort_storage) { | |
| 973 | 980 | wx.getLocation({ |
| 974 | 981 | type: 'gcj02', |
| 975 | 982 | success: function(res) { |
| ... | ... | @@ -1034,7 +1041,7 @@ Page({ |
| 1034 | 1041 | var t_time = setInterval(function() { |
| 1035 | 1042 | if (th.data.bconfig == null) false; |
| 1036 | 1043 | var e = th.data.bconfig; |
| 1037 | - if (e.is_sort_storage) { | |
| 1044 | + if (e && e.is_sort_storage) { | |
| 1038 | 1045 | wx.getLocation({ |
| 1039 | 1046 | type: 'gcj02', |
| 1040 | 1047 | success: function(res) { |
| ... | ... | @@ -1109,7 +1116,7 @@ Page({ |
| 1109 | 1116 | if (e.data.code == 0) { |
| 1110 | 1117 | |
| 1111 | 1118 | //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 |
| 1112 | - if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){ | |
| 1119 | + if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){ | |
| 1113 | 1120 | th.setData({ |
| 1114 | 1121 | def_pick_store:e.data.data.pageData[0], |
| 1115 | 1122 | sto_sele_name: e.data.data.pageData[0].pickup_name, |
| ... | ... | @@ -1289,7 +1296,7 @@ Page({ |
| 1289 | 1296 | only_pk: e.data.data.pageData |
| 1290 | 1297 | }); |
| 1291 | 1298 | //-----如果没有默认门店，要取第一个门店作为默认店------ |
| 1292 | - if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { | |
| 1299 | + if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { | |
| 1293 | 1300 | th.setData({ |
| 1294 | 1301 | def_pick_store:e.data.data.pageData[0], |
| 1295 | 1302 | sto_sele_name: e.data.data.pageData[0].pickup_name, | ... | ... |
pages/team/team_success/team_success.js
| ... | ... | @@ -47,6 +47,7 @@ Page({ |
| 47 | 47 | }, |
| 48 | 48 | onLoad: function (t) { |
| 49 | 49 | wx.setNavigationBarTitle({ title: "拼团订单",}) |
| 50 | + | |
| 50 | 51 | var that=this; |
| 51 | 52 | var th=this; |
| 52 | 53 | //获取用户设备信息，屏幕宽度 |
| ... | ... | @@ -56,7 +57,7 @@ Page({ |
| 56 | 57 | } |
| 57 | 58 | }) |
| 58 | 59 | var pay_f = t.payf, order_sn = t.ordersn; |
| 59 | - this.setData({ pay_f: pay_f, order_sn: order_sn}), | |
| 60 | + this.setData({ pay_f: pay_f, order_sn: order_sn}); | |
| 60 | 61 | this.init(order_sn); |
| 61 | 62 | |
| 62 | 63 | //-- 自定义海报 -- |
| ... | ... | @@ -209,6 +210,19 @@ Page({ |
| 209 | 210 | min_price=pri; |
| 210 | 211 | |
| 211 | 212 | } |
| 213 | + | |
| 214 | + | |
| 215 | + //获取商品信息 | |
| 216 | + getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { | |
| 217 | + }).then(res => { | |
| 218 | + //商品地址 | |
| 219 | + original_img = ee.data.imageurl+ res.data.data.original_img, | |
| 220 | + goods = res.data.data | |
| 221 | + | |
| 222 | + ee.setData({goods: goods,image: original_img,}) | |
| 223 | + | |
| 224 | + }) | |
| 225 | + | |
| 212 | 226 | } |
| 213 | 227 | }) |
| 214 | 228 | |
| ... | ... | @@ -233,13 +247,7 @@ Page({ |
| 233 | 247 | } |
| 234 | 248 | |
| 235 | 249 | |
| 236 | - //获取商品信息 | |
| 237 | - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { | |
| 238 | - }).then(res => { | |
| 239 | - //商品地址 | |
| 240 | - original_img = ee.data.imageurl+ res.data.data.original_img, | |
| 241 | - goods = res.data.data | |
| 242 | - }) | |
| 250 | + | |
| 243 | 251 | |
| 244 | 252 | //获取活动从表信息team_id:305暂时 |
| 245 | 253 | await getApp().request.promiseGet("/api/weshop/teamgroup/page" , { |
| ... | ... | @@ -266,10 +274,14 @@ Page({ |
| 266 | 274 | } |
| 267 | 275 | |
| 268 | 276 | //获取大家都在团信息 |
| 269 | - await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { | |
| 277 | + getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { | |
| 270 | 278 | data:{page:1,pageSize:2} |
| 271 | 279 | }).then(res => { |
| 272 | - pageteam = res.data.data.pageData; | |
| 280 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 281 | + pageteam = res.data.data.pageData; | |
| 282 | + ee.setData({pageteam: pageteam,}) | |
| 283 | + } | |
| 284 | + | |
| 273 | 285 | }) |
| 274 | 286 | |
| 275 | 287 | //--当是成团的时候的操作-- |
| ... | ... | @@ -277,8 +289,8 @@ Page({ |
| 277 | 289 | //设置值 |
| 278 | 290 | |
| 279 | 291 | ee.setData({ |
| 280 | - ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, goods: goods, pageteam: pageteam, min_price: min_price, | |
| 281 | - order: order, image: original_img, share_img: share_img,max_num:max_num, | |
| 292 | + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price, | |
| 293 | + order: order, share_img: share_img,max_num:max_num, | |
| 282 | 294 | pindGoods: teamlist,is_show:1, zk:false, |
| 283 | 295 | hiddenName: false, ct_price:ct_price,p_status:p_status,sf_arr:sf_arr}); |
| 284 | 296 | |
| ... | ... | @@ -290,8 +302,8 @@ Page({ |
| 290 | 302 | console.log("239什么鬼", teamlist); |
| 291 | 303 | //设置值 |
| 292 | 304 | ee.setData({ |
| 293 | - ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, goods: goods, pageteam: pageteam, | |
| 294 | - order: order, image: original_img, p_status: p_status, min_price:min_price, | |
| 305 | + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, | |
| 306 | + order: order, p_status: p_status, min_price:min_price, | |
| 295 | 307 | share_img: share_img, max_num: max_num, pindGoods: teamlist, is_show: 1, |
| 296 | 308 | ct_price: ct_price, p_status: p_status,sf_arr:sf_arr}); |
| 297 | 309 | } |
| ... | ... | @@ -328,6 +340,8 @@ Page({ |
| 328 | 340 | // 获取当前时间，同时得到活动结束时间数组 |
| 329 | 341 | var newTime = ut.gettimestamp(); |
| 330 | 342 | var o = this.data.teamgroup; |
| 343 | + if(!o) return false; | |
| 344 | + | |
| 331 | 345 | var endTime = o.kt_end_time; |
| 332 | 346 | if (o.status == 0) endTime = o.start_time; |
| 333 | 347 | ... | ... |
pages/template/index.json
| ... | ... | @@ -18,6 +18,8 @@ |
| 18 | 18 | "assist":"/components/diy_assist/diy_assist", |
| 19 | 19 | "picMax": "/components/diy_picMax/diy_picMax", |
| 20 | 20 | "mvideo": "/components/diy_video/diy_video", |
| 21 | - "service": "/components/diy_service/diy_service" | |
| 22 | - } | |
| 21 | + "service": "/components/diy_service/diy_service", | |
| 22 | + "scan": "/components/diy_scan/diy_scan" | |
| 23 | + }, | |
| 24 | + "enablePullDownRefresh": false | |
| 23 | 25 | } |
| 24 | 26 | \ No newline at end of file | ... | ... |
pages/template/index.wxml
| ... | ... | @@ -57,6 +57,10 @@ |
| 57 | 57 | <block wx:if="{{item.ename=='onlineService'}}"> |
| 58 | 58 | <service object="{{item.content}}"></service> |
| 59 | 59 | </block> |
| 60 | + <!--扫一扫--> | |
| 61 | + <block wx:if="{{item.ename=='scan'}}"> | |
| 62 | + <scan object="{{item.content}}"></scan> | |
| 63 | + </block> | |
| 60 | 64 | </view> |
| 61 | 65 | </block> |
| 62 | 66 | </view> | ... | ... |
pages/togoin/togoin.js
| ... | ... | @@ -67,7 +67,7 @@ Page({ |
| 67 | 67 | that.setData({user:user}) |
| 68 | 68 | //如果有会员的话,没有sessionKey |
| 69 | 69 | if(!e.data.data.sessionKey){ |
| 70 | - getApp().showWarning("登陆成功"); | |
| 70 | + getApp().showWarning("登录成功"); | |
| 71 | 71 | getApp().globalData.userInfo=e.data.data; |
| 72 | 72 | getApp().globalData.user_id=e.data.data.user_id; |
| 73 | 73 | getApp().globalData.openid = e.data.data.weapp_openid; |
| ... | ... | @@ -89,7 +89,7 @@ Page({ |
| 89 | 89 | }) |
| 90 | 90 | }, |
| 91 | 91 | |
| 92 | - //暂不登陆，返回上一页 | |
| 92 | + //暂不登录，返回上一页 | |
| 93 | 93 | cancle_bind:function () { |
| 94 | 94 | wx.navigateBack({ delta: 1}) |
| 95 | 95 | }, | ... | ... |
pages/togoin/togoin.wxml
| ... | ... | @@ -16,20 +16,20 @@ |
| 16 | 16 | <button hidden="{{user}}" class="getPhoneNumber" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo"> |
| 17 | 17 | <view class="flex flex-center2 ali-c"> |
| 18 | 18 | <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> |
| 19 | - <view>微信账号快捷登陆</view> | |
| 19 | + <view>微信账号快捷登录</view> | |
| 20 | 20 | </view> |
| 21 | 21 | </button> |
| 22 | 22 | <!-- 点击显示绑定手机的对话框 --> |
| 23 | 23 | <button hidden="{{!user}}" class="getPhoneNumber" bindtap="show_bind_mobile"> |
| 24 | 24 | <view class="flex flex-center2 ali-c" > |
| 25 | 25 | <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image> |
| 26 | - <view>微信账号快捷登陆</view> | |
| 26 | + <view>微信账号快捷登录</view> | |
| 27 | 27 | </view> |
| 28 | 28 | </button> |
| 29 | 29 | </view> |
| 30 | 30 | |
| 31 | 31 | <view class="userlongin flex-center2 flex fs30 jc_sb" style="margin: 0 130rpx"> |
| 32 | - <view bindtap="cancle_bind">暂不登陆</view> | |
| 32 | + <view bindtap="cancle_bind">暂不登录</view> | |
| 33 | 33 | </view> |
| 34 | 34 | |
| 35 | 35 | </view> |
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 | <view class="cover-layer" bindtap="close_pop"></view> |
| 42 | 42 | <view class="p_content"> |
| 43 | 43 | <view class="p_title flex ali-c fs34"> |
| 44 | - 请授权绑定手机号完成注册，拒绝将登陆失败 | |
| 44 | + 请授权绑定手机号完成注册，拒绝将登录失败 | |
| 45 | 45 | </view> |
| 46 | 46 | <view class="flex btn_view"> |
| 47 | 47 | <view bindtap="close_pop" style="height: 100%; line-height:normal;" class="txt-center f2 flex ali-c flex-center2 fs36 b_right">拒绝</view> | ... | ... |
pages/user/assistance/assistance.js
| ... | ... | @@ -228,6 +228,22 @@ Page({ |
| 228 | 228 | var help_id = this.data.help_id; |
| 229 | 229 | var taskid=e.currentTarget.dataset.taskid; |
| 230 | 230 | getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid); |
| 231 | - } | |
| 231 | + }, | |
| 232 | + | |
| 233 | + onShareAppMessage(res) { | |
| 234 | + if (res.from === 'button') { | |
| 235 | + // 来自页面内转发按钮 | |
| 236 | + console.log(res.target) | |
| 237 | + } | |
| 238 | + return { | |
| 239 | + // title: '自定义转发标题', | |
| 240 | + } | |
| 241 | + }, | |
| 242 | + | |
| 243 | + onShareTimeline() { | |
| 244 | + return { | |
| 245 | + title: '好友助力-' + getApp().globalData.config.store_name, | |
| 246 | + } | |
| 247 | + }, | |
| 232 | 248 | |
| 233 | 249 | }) | ... | ... |
pages/user/assistance/task_assistance.js
| ... | ... | @@ -203,7 +203,7 @@ Page({ |
| 203 | 203 | getApp().my_warnning(data.msg, 0, th); |
| 204 | 204 | return false; |
| 205 | 205 | } |
| 206 | - if (data.code == 0) { | |
| 206 | + if (data.code == 0 && data.data && data.data.pageData && data.data.pageData.length>0) { | |
| 207 | 207 | //轮播图的数据 |
| 208 | 208 | var data_aissa = data.data.pageData; |
| 209 | 209 | //当前时间戳 | ... | ... |
pages/user/coupons/coupons.js
| ... | ... | @@ -229,16 +229,20 @@ Page({ |
| 229 | 229 | getApp().request.promiseGet("/api/weshop/users/listQuan", { |
| 230 | 230 | data:get_data |
| 231 | 231 | }).then(res=>{ |
| 232 | - var a = res.data,val = a.data.total; | |
| 233 | - var details = a.data.pageData; | |
| 234 | - if (details.length == 0){ | |
| 235 | - if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); | |
| 236 | - return false; | |
| 237 | - } | |
| 238 | - | |
| 239 | - var all_length=val+th.data.b_out_arr.length; | |
| 240 | - th.setData({ number: all_length}); | |
| 241 | - | |
| 232 | + | |
| 233 | + if(res.data.code==0 && res.data){ | |
| 234 | + var a = res.data,val = a.data.total; | |
| 235 | + var details = a.data.pageData; | |
| 236 | + if (details.length == 0){ | |
| 237 | + if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); | |
| 238 | + return false; | |
| 239 | + } | |
| 240 | + var all_length=val; | |
| 241 | + if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; | |
| 242 | + th.setData({ number: all_length}); | |
| 243 | + } | |
| 244 | + | |
| 245 | + | |
| 242 | 246 | }) |
| 243 | 247 | }, |
| 244 | 248 | ... | ... |
pages/user/coupons/coupons.wxml
| ... | ... | @@ -63,7 +63,8 @@ |
| 63 | 63 | <view wx:else> |
| 64 | 64 | <view class="text">有效期:不限</view> |
| 65 | 65 | </view> |
| 66 | - <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}} | |
| 66 | + <view wx:if="{{detail.Remark}}" class="textss">{{detail.Remark}}</view> | |
| 67 | + <view wx:else class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}} | |
| 67 | 68 | </view> |
| 68 | 69 | |
| 69 | 70 | </view> | ... | ... |
pages/user/index/index.js
| ... | ... | @@ -143,12 +143,15 @@ Page({ |
| 143 | 143 | /*-----获取线下会员的预存款和优惠券的数量-----*/ |
| 144 | 144 | rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { |
| 145 | 145 | success: function(su) { |
| 146 | - var data = su.data.data; | |
| 147 | - if(!data) data={}; | |
| 148 | - data.cashcount = parseInt(data.cashcount); | |
| 149 | - s.setData({ | |
| 150 | - udata: data, | |
| 151 | - }); | |
| 146 | + if(su.data.code==0 && su.data.data ) { | |
| 147 | + var data = su.data.data; | |
| 148 | + if(!data) data={}; | |
| 149 | + data.cashcount = parseInt(data.cashcount); | |
| 150 | + s.setData({ | |
| 151 | + udata: data, | |
| 152 | + }); | |
| 153 | + } | |
| 154 | + | |
| 152 | 155 | } |
| 153 | 156 | }) |
| 154 | 157 | /*-----获取会员提现金额-----*/ | ... | ... |
pages/user/index/index.wxml
| ... | ... | @@ -213,19 +213,19 @@ |
| 213 | 213 | </block> |
| 214 | 214 | <block wx:elif="{{item.name=='助力活动'}}"> |
| 215 | 215 | <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}"> |
| 216 | - <image class="xc-center-img " src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image> | |
| 216 | + <image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image> | |
| 217 | 217 | <view class="four-level-word">助力活动</view> |
| 218 | 218 | </view> |
| 219 | 219 | </block> |
| 220 | 220 | <block wx:elif="{{item.name=='我的权益'}}"> |
| 221 | 221 | <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}"> |
| 222 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 222 | + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | |
| 223 | 223 | <view class="fs26">我的权益</view> |
| 224 | 224 | </view> |
| 225 | 225 | </block> |
| 226 | 226 | <block wx:else> |
| 227 | 227 | <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav"> |
| 228 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 228 | + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | |
| 229 | 229 | <view class="fs26">{{item.name}}</view> |
| 230 | 230 | </view> |
| 231 | 231 | </block> | ... | ... |
pages/user/integral/filter.wxs
| ... | ... | @@ -2,8 +2,14 @@ var numFr = { |
| 2 | 2 | getNum: function(x) { |
| 3 | 3 | var f = parseInt(x); |
| 4 | 4 | return f; |
| 5 | + }, | |
| 6 | + getval: function(x,n) { | |
| 7 | + var f = parseFloat(x); | |
| 8 | + f=f.toFixed(n); | |
| 9 | + return f; | |
| 5 | 10 | } |
| 6 | 11 | } |
| 7 | 12 | module.exports = { |
| 8 | - getNum: numFr.getNum | |
| 13 | + getNum: numFr.getNum, | |
| 14 | + getval: numFr.getval, | |
| 9 | 15 | } |
| 10 | 16 | \ No newline at end of file | ... | ... |
pages/user/integral/integral.js
| ... | ... | @@ -73,13 +73,15 @@ Page({ |
| 73 | 73 | await getApp().request.promiseGet("/api/weshop/users/listPoints", { |
| 74 | 74 | data: get_data |
| 75 | 75 | }).then(res => { |
| 76 | + | |
| 76 | 77 | var msg = res.data; |
| 77 | - details = msg.data.pageData; | |
| 78 | - if (details.length == 0) { | |
| 78 | + if(!msg || !msg.data.pageData || msg.data.pageData.length == 0){ | |
| 79 | 79 | this.data.is_no_more = 1; |
| 80 | 80 | getApp().showWarning("未找更多数据"); |
| 81 | 81 | return false; |
| 82 | 82 | } |
| 83 | + | |
| 84 | + details = msg.data.pageData; | |
| 83 | 85 | details.forEach(function (val, ind) { |
| 84 | 86 | big_arr.push(val); |
| 85 | 87 | }) | ... | ... |
pages/user/integral/integral.wxml
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | <view class="money-rim"> |
| 56 | 56 | <view class="tosum"> |
| 57 | 57 | <view class="rbm">￥</view> |
| 58 | - <text class='f_big'>{{filter.getNum(result.ToSum)}}</text> | |
| 58 | + <text class='f_big'>{{filter.getval(result.ToSum,2)}}</text> | |
| 59 | 59 | </view> |
| 60 | 60 | </view> |
| 61 | 61 | <view class='mb20'>充值{{result.Integral}}积分</view> |
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | <view class="text">充值{{integral}}积分</view> |
| 75 | 75 | <view class="min-rim"> |
| 76 | 76 | <view class="fh">¥</view> |
| 77 | - <view class="value">{{filter.getNum(money)}}</view> | |
| 77 | + <view class="value">{{filter.getval(money,2)}}</view> | |
| 78 | 78 | </view> |
| 79 | 79 | </view> |
| 80 | 80 | <view class="bk"> | ... | ... |
pages/user/integral/query/index.js
| ... | ... | @@ -168,19 +168,19 @@ Page({ |
| 168 | 168 | }).then(res => { |
| 169 | 169 | |
| 170 | 170 | var details = res.data; |
| 171 | - console.log(details, "iiii"); | |
| 172 | - var details = details.data.pageData; | |
| 173 | - console.log(details, "aaa"); | |
| 174 | 171 | |
| 175 | - if (details.length == 0) { | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + if (!details.data || details.data.pageData.length == 0) { | |
| 176 | 176 | // this.data.is_no_more = 1; |
| 177 | - console.log("无极剑圣", details); | |
| 178 | - | |
| 179 | 177 | getApp().showWarning("未找更多数据"); |
| 180 | 178 | return false; |
| 181 | 179 | } |
| 182 | - console.log("不空", details); | |
| 183 | - console.log("长度", details.length); | |
| 180 | + | |
| 181 | + var details = details.data.pageData; | |
| 182 | + | |
| 183 | + | |
| 184 | 184 | details.forEach(function (val, ind) { |
| 185 | 185 | big_arr.push(val); |
| 186 | 186 | }) | ... | ... |
pages/user/member/account/account.js
| ... | ... | @@ -100,16 +100,15 @@ Page({ |
| 100 | 100 | data: get_data, isShowLoading:1 |
| 101 | 101 | }).then(res => { |
| 102 | 102 | var details = res.data; |
| 103 | - // console.log(details, "iiii"); | |
| 104 | - var details=details.data.pageData; | |
| 105 | - //console.log(details,"aaa"); | |
| 106 | 103 | |
| 107 | - if (details.length== 0){ | |
| 104 | + if (!details || !details.data || !details.data.pageData || details.data.pageData.length== 0){ | |
| 108 | 105 | this.data.is_no_more=1; |
| 109 | 106 | getApp().showWarning("未找更多数据"); |
| 110 | 107 | |
| 111 | 108 | return false; |
| 112 | 109 | } |
| 110 | + | |
| 111 | + var details=details.data.pageData; | |
| 113 | 112 | // console.log("不空", details); |
| 114 | 113 | // console.log("长度", details.length); |
| 115 | 114 | details.forEach(function(val,ind){ | ... | ... |
pages/user/member/account_unable/account_unable.js
| ... | ... | @@ -99,17 +99,16 @@ Page({ |
| 99 | 99 | await getApp().request.promiseGet("/api/weshop/users/pageUnablereCord", { |
| 100 | 100 | data: get_data, isShowLoading: 1 |
| 101 | 101 | }).then(res => { |
| 102 | + | |
| 102 | 103 | var details = res.data; |
| 103 | - // console.log(details, "iiii"); | |
| 104 | - var details = details.data.pageData; | |
| 105 | - //console.log(details,"aaa"); | |
| 106 | 104 | |
| 107 | - if (details.length == 0) { | |
| 105 | + if ( !details || !details.data || !details.data.pageData || details.data.pageData.length == 0) { | |
| 108 | 106 | this.data.is_no_more = 1; |
| 109 | 107 | getApp().showWarning("未找更多数据"); |
| 110 | - | |
| 111 | 108 | return false; |
| 112 | 109 | } |
| 110 | + | |
| 111 | + var details = details.data.pageData; | |
| 113 | 112 | // console.log("不空", details); |
| 114 | 113 | // console.log("长度", details.length); |
| 115 | 114 | details.forEach(function (val, ind) { | ... | ... |
pages/user/member/cash_record/cash_record.js
| ... | ... | @@ -110,17 +110,14 @@ Page({ |
| 110 | 110 | data: get_data, isShowLoading: 1 |
| 111 | 111 | }).then(res => { |
| 112 | 112 | var details = res.data; |
| 113 | - console.log(details, "iiii"); | |
| 114 | - var details = details.data.pageData; | |
| 115 | - console.log(details, "aaa"); | |
| 116 | 113 | |
| 117 | - if (details.length == 0) { | |
| 114 | + if (!details || !details.data || !details.data.pageData || details.data.pageData.length == 0) { | |
| 118 | 115 | this.data.is_no_more = 1; |
| 119 | 116 | getApp().showWarning("未找更多数据"); |
| 120 | 117 | return false; |
| 121 | 118 | } |
| 122 | - console.log("不空", details); | |
| 123 | - console.log("长度", details.length); | |
| 119 | + var details = details.data.pageData; | |
| 120 | + | |
| 124 | 121 | details.forEach(function (val, ind) { |
| 125 | 122 | big_arr.push(val); |
| 126 | 123 | }) | ... | ... |
pages/user/order_list/order_list.wxml
| ... | ... | @@ -222,7 +222,7 @@ |
| 222 | 222 | </view> |
| 223 | 223 | <view class="subitem"> |
| 224 | 224 | <view class="key">单价</view> |
| 225 | - <view class="val">￥{{i.Price}}({{i.PosPrice}})</view> | |
| 225 | + <view class="val">￥{{i.Price}}(<text style="text-decoration: line-through;">{{i.PosPrice}}</text>)</view> | |
| 226 | 226 | </view> |
| 227 | 227 | <view class="subitem"> |
| 228 | 228 | <view class="key">金额</view> | ... | ... |