Commit 9c49a111c5e27aa8c48a33db889a8ce130dd99b4
合并最新
Showing
21 changed files
with
2139 additions
and
1858 deletions
app.js
| @@ -129,7 +129,7 @@ App({ | @@ -129,7 +129,7 @@ App({ | ||
| 129 | cartGoodsNum:this.globalData.cartGoodsNum | 129 | cartGoodsNum:this.globalData.cartGoodsNum |
| 130 | }) | 130 | }) |
| 131 | }, | 131 | }, |
| 132 | - | 132 | + |
| 133 | globalData: { | 133 | globalData: { |
| 134 | cartGoodsNum:0, //购物车总数量 | 134 | cartGoodsNum:0, //购物车总数量 |
| 135 | isTabBar :false, | 135 | isTabBar :false, |
| @@ -186,7 +186,6 @@ App({ | @@ -186,7 +186,6 @@ App({ | ||
| 186 | app.globalData.user_id= app.globalData.userInfo.user_id; | 186 | app.globalData.user_id= app.globalData.userInfo.user_id; |
| 187 | } | 187 | } |
| 188 | } | 188 | } |
| 189 | - | ||
| 190 | wx.getSystemInfo({ | 189 | wx.getSystemInfo({ |
| 191 | success: (res) => { | 190 | success: (res) => { |
| 192 | // console.log(res) | 191 | // console.log(res) |
| @@ -594,6 +593,8 @@ App({ | @@ -594,6 +593,8 @@ App({ | ||
| 594 | this.globalData.wuliu=null; //关闭要把物流清空 | 593 | this.globalData.wuliu=null; //关闭要把物流清空 |
| 595 | this.globalData.room_id=null; //关闭要把房间号关闭 | 594 | this.globalData.room_id=null; //关闭要把房间号关闭 |
| 596 | this.globalData.room_goods_id=null; //关闭要把物流清空 | 595 | this.globalData.room_goods_id=null; //关闭要把物流清空 |
| 596 | + this.globalData.config2=null; //清除config2的缓存 | ||
| 597 | + this.globalData.config=null; //清除config的缓存 | ||
| 597 | } | 598 | } |
| 598 | 599 | ||
| 599 | 600 |
app.json
| @@ -87,12 +87,6 @@ | @@ -87,12 +87,6 @@ | ||
| 87 | "pages/template/index", | 87 | "pages/template/index", |
| 88 | "pages/store/index" | 88 | "pages/store/index" |
| 89 | ], | 89 | ], |
| 90 | - "plugins": { | ||
| 91 | - "live-player-plugin": { | ||
| 92 | - "version": "1.1.1", | ||
| 93 | - "provider": "wx2b03c6e691cd7370" | ||
| 94 | - } | ||
| 95 | - }, | ||
| 96 | "subPackages": [{ | 90 | "subPackages": [{ |
| 97 | "root": "packageA/", | 91 | "root": "packageA/", |
| 98 | "name":"pack1", | 92 | "name":"pack1", |
packageA/pages/liveStream/liveStream.js
| 1 | // pages/liveStream/liveStream.js | 1 | // pages/liveStream/liveStream.js |
| 2 | - | ||
| 3 | var t = require("../../../utils/util"), | 2 | var t = require("../../../utils/util"), |
| 4 | ut = t, | 3 | ut = t, |
| 5 | e = require("../../../utils/common.js"), | 4 | e = require("../../../utils/common.js"), |
| @@ -10,20 +9,26 @@ var t = require("../../../utils/util"), | @@ -10,20 +9,26 @@ var t = require("../../../utils/util"), | ||
| 10 | oo = s.globalData, | 9 | oo = s.globalData, |
| 11 | o = s.globalData.setting, | 10 | o = s.globalData.setting, |
| 12 | os = o; | 11 | os = o; |
| 13 | -var utils = require('../../../utils/util.js'),ut=utils; | ||
| 14 | var regeneratorRuntime = require('../../../utils/runtime.js'); | 12 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
| 15 | 13 | ||
| 16 | Page({ | 14 | Page({ |
| 17 | - | ||
| 18 | /** | 15 | /** |
| 19 | * 页面的初始数据 | 16 | * 页面的初始数据 |
| 20 | */ | 17 | */ |
| 21 | data: { | 18 | data: { |
| 22 | - goodsList: [], | ||
| 23 | - imghost: '', | ||
| 24 | - liveList: {} | 19 | + curPage: 1, |
| 20 | + pageNum: 1, | ||
| 21 | + liveing: [], | ||
| 22 | + livetoBegin: [], | ||
| 23 | + liveOver: [] | ||
| 25 | }, | 24 | }, |
| 26 | - | 25 | + // list: [], |
| 26 | + // live: { | ||
| 27 | + // ing:[], | ||
| 28 | + // toBegin:[], | ||
| 29 | + // over:[] | ||
| 30 | + // }, | ||
| 31 | + | ||
| 27 | // 点击直播列表项 | 32 | // 点击直播列表项 |
| 28 | clickItem: function (e) { | 33 | clickItem: function (e) { |
| 29 | // id：列表项id | 34 | // id：列表项id |
| @@ -32,66 +37,191 @@ Page({ | @@ -32,66 +37,191 @@ Page({ | ||
| 32 | url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + e.currentTarget.dataset.live | 37 | url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + e.currentTarget.dataset.live |
| 33 | }) | 38 | }) |
| 34 | console.log('options-->'); | 39 | console.log('options-->'); |
| 35 | - }, | 40 | + }, |
| 36 | 41 | ||
| 37 | // 点击 订阅/观看直播/观看回放 按钮，跳转直播组件 | 42 | // 点击 订阅/观看直播/观看回放 按钮，跳转直播组件 |
| 38 | clickLive: function (e) { | 43 | clickLive: function (e) { |
| 39 | - console.log('当前房间号roomid：',e.currentTarget.dataset.roomid); | 44 | + console.log('当前房间号roomid：', e.currentTarget.dataset.roomid); |
| 40 | let roomId = e.currentTarget.dataset.roomid; | 45 | let roomId = e.currentTarget.dataset.roomid; |
| 41 | - let customParams = encodeURIComponent(JSON.stringify({ path: 'pages/index/index', pid: 1 })); | 46 | + let customParams = encodeURIComponent(JSON.stringify({ |
| 47 | + path: 'pages/index/index', | ||
| 48 | + pid: 1 | ||
| 49 | + })); | ||
| 42 | wx.navigateTo({ | 50 | wx.navigateTo({ |
| 43 | url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}&custom_params=${customParams}` | 51 | url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}&custom_params=${customParams}` |
| 44 | }) | 52 | }) |
| 45 | }, | 53 | }, |
| 46 | 54 | ||
| 47 | - /** | ||
| 48 | - * 生命周期函数--监听页面加载 | ||
| 49 | - */ | ||
| 50 | - onLoad: function (options) { | ||
| 51 | - var live = {}; | ||
| 52 | - live.toBegin = []; // 即将开始 | ||
| 53 | - live.ing = []; // 直播中 | ||
| 54 | - live.over = []; // 已结束 | 55 | + updateLiveList: function () { |
| 56 | + return new Promise((resolve, reject) => { | ||
| 57 | + let self = this; | ||
| 58 | + getApp().request.put("/api/weshop/wx/livelist/updatelivelist", { | ||
| 59 | + data: { | ||
| 60 | + storeId: 1 | ||
| 61 | + }, | ||
| 62 | + success: function (res) { | ||
| 63 | + console.log('我发起了PUT请求,请求结果：', res.data); | ||
| 64 | + resolve(); | ||
| 65 | + } | ||
| 66 | + }); | ||
| 67 | + }); | ||
| 68 | + }, | ||
| 55 | 69 | ||
| 56 | - // 请求数据 | 70 | + loadLiveList: function (curPage) { |
| 71 | + // console.log('---->curPage', curPage); | ||
| 72 | + // var live = {}; | ||
| 73 | + // live.toBegin = []; // 即将开始 | ||
| 74 | + // live.ing = []; // 直播中 | ||
| 75 | + // var liveOver = []; // 已结束 | ||
| 57 | var that = this; | 76 | var that = this; |
| 58 | - getApp().request.promiseGet("/api/weshop/wx/livelist/page", {}).then(res=>{ | ||
| 59 | - console.log('ressss--->',res); | ||
| 60 | - if(res.data.code==0){ | ||
| 61 | - that.setData({ | ||
| 62 | - goodsList: res.data.data.pageData | ||
| 63 | - }) | ||
| 64 | - } | ||
| 65 | - // console.log(goodsList); | ||
| 66 | - | ||
| 67 | - var result = res.data.data.pageData; | ||
| 68 | - var liveStatus; | ||
| 69 | - if(res.data.code == 0) { | ||
| 70 | - for(var i in result) { | ||
| 71 | - console.log(i + '当前直播状态：', result[i].live_status); | ||
| 72 | - liveStatus = result[i].live_status; | ||
| 73 | - // 这里只显示101/102/103状态 | ||
| 74 | - if (liveStatus == '101') { | ||
| 75 | - live.ing.push(result[i]); | ||
| 76 | - } else if (liveStatus == '102') { | ||
| 77 | - live.toBegin.push(result[i]); | ||
| 78 | - } else if (liveStatus == '103') { | ||
| 79 | - live.over.push(result[i]); | ||
| 80 | - } | ||
| 81 | - } | ||
| 82 | - // console.log('live--->', live); | 77 | + var storeId = o.stoid; |
| 78 | + | ||
| 79 | + // 请求数据 | ||
| 80 | + getApp().request.promiseGet("/api/weshop/wx/livelist/page", { | ||
| 81 | + data: { | ||
| 82 | + storedId: o.stoid, | ||
| 83 | + page: curPage, | ||
| 84 | + live_status: 103 | ||
| 85 | + } | ||
| 86 | + }).then(res => { | ||
| 87 | + if (res.data.code == 0) { | ||
| 88 | + console.log('res------------>', res); | ||
| 89 | + // 计算总页数 | ||
| 90 | + // var total = res.data.data.total; | ||
| 91 | + // console.log("total", total); | ||
| 92 | + // var pageSize = res.data.data.pageSize; | ||
| 93 | + // console.log("pageSize", pageSize); | ||
| 94 | + // var pageNum = that.pageTotal(total, pageSize); | ||
| 95 | + // that.setData({ | ||
| 96 | + // pageNum: that.pageTotal(total, pageSize) | ||
| 97 | + // }); | ||
| 98 | + | ||
| 99 | + // 如果当前请求的是第一页数据，则执行赋值，否则执行合并再赋值 | ||
| 100 | + if (curPage == 1) { | ||
| 101 | + that.setData({ | ||
| 102 | + liveOver: that.data.liveOver.concat(res.data.data.pageData) | ||
| 103 | + }) | ||
| 104 | + } else { | ||
| 105 | + that.setData({ | ||
| 106 | + liveOver: that.data.liveOver.concat(res.data.data.pageData) | ||
| 107 | + }) | ||
| 108 | + }; | ||
| 109 | + | ||
| 110 | + // var list = that.data.list; | ||
| 111 | + // for(var i in list) { | ||
| 112 | + // var liveStatus = list[i].live_status; | ||
| 113 | + // if (liveStatus == '101') { | ||
| 114 | + // live.ing.push(list[i]); | ||
| 115 | + // } else if (liveStatus == '102') { | ||
| 116 | + // live.toBegin.push(list[i]); | ||
| 117 | + // } else if (liveStatus == '103') { | ||
| 118 | + // live.over.push(list[i]); | ||
| 119 | + // } | ||
| 120 | + // } | ||
| 121 | + | ||
| 122 | + // that.setData({ | ||
| 123 | + // liveOver: list | ||
| 124 | + // }); | ||
| 125 | + | ||
| 126 | + curPage++; | ||
| 83 | that.setData({ | 127 | that.setData({ |
| 84 | - live | 128 | + curPage |
| 85 | }); | 129 | }); |
| 130 | + | ||
| 131 | + console.log('上拉已经触发，当前page------------------------->',that.data.curPage); | ||
| 132 | + | ||
| 133 | + } else { | ||
| 134 | + console.error('请求失败！！！！！'); | ||
| 86 | } | 135 | } |
| 87 | }) | 136 | }) |
| 88 | }, | 137 | }, |
| 89 | 138 | ||
| 139 | + pageTotal: function (rowCount, pageSize) { | ||
| 140 | + if (rowCount == null || rowCount == "") { | ||
| 141 | + return 0; | ||
| 142 | + } else { | ||
| 143 | + if (pageSize != 0 && rowCount % pageSize == 0) { | ||
| 144 | + return parseInt(rowCount / pageSize) | ||
| 145 | + }; | ||
| 146 | + if (pageSize != 0 && rowCount % pageSize != 0) { | ||
| 147 | + return parseInt(rowCount / pageSize) + 1; | ||
| 148 | + }; | ||
| 149 | + } | ||
| 150 | + }, | ||
| 151 | + | ||
| 152 | + getData: function (liveStatus) { | ||
| 153 | + var that = this; | ||
| 154 | + var curPage = this.data.curPage | ||
| 155 | + getApp().request.promiseGet("/api/weshop/wx/livelist/page", { | ||
| 156 | + data: { | ||
| 157 | + storedId: o.stoid, | ||
| 158 | + page: curPage, | ||
| 159 | + live_status: liveStatus | ||
| 160 | + } | ||
| 161 | + }).then(res => { | ||
| 162 | + if (res.data.code == 0) { | ||
| 163 | + if (liveStatus == 101) { | ||
| 164 | + that.setData({ | ||
| 165 | + liveing: res.data.data.pageData | ||
| 166 | + }); | ||
| 167 | + } else if (liveStatus == 102) { | ||
| 168 | + that.setData({ | ||
| 169 | + livetoBegin: res.data.data.pageData | ||
| 170 | + }); | ||
| 171 | + } else if (liveStatus == 103) { | ||
| 172 | + that.setData({ | ||
| 173 | + liveOver: res.data.data.pageData | ||
| 174 | + }); | ||
| 175 | + | ||
| 176 | + var total = res.data.data.total; | ||
| 177 | + console.log("total", total); | ||
| 178 | + var pageSize = res.data.data.pageSize; | ||
| 179 | + console.log("pageSize", pageSize); | ||
| 180 | + var pageNum = that.pageTotal(total, pageSize); | ||
| 181 | + console.log("pageNum", pageNum); | ||
| 182 | + that.setData({ | ||
| 183 | + pageNum | ||
| 184 | + }); | ||
| 185 | + | ||
| 186 | + } | ||
| 187 | + } | ||
| 188 | + | ||
| 189 | + curPage++; | ||
| 190 | + that.setData({ | ||
| 191 | + curPage | ||
| 192 | + }); | ||
| 193 | + | ||
| 194 | + }); | ||
| 195 | + }, | ||
| 196 | + | ||
| 197 | + /** | ||
| 198 | + * 生命周期函数--监听页面加载 | ||
| 199 | + */ | ||
| 200 | + onLoad: function (options) { | ||
| 201 | + console.log('ppppp',this.pageTotal(4, 10)); | ||
| 202 | + // var self = this; | ||
| 203 | + // this.updateLiveList().then(() => { | ||
| 204 | + // self.getData(101); | ||
| 205 | + // self.getData(102); | ||
| 206 | + // self.getData(103); | ||
| 207 | + // }); | ||
| 208 | + }, | ||
| 209 | + | ||
| 90 | /** | 210 | /** |
| 91 | * 生命周期函数--监听页面初次渲染完成 | 211 | * 生命周期函数--监听页面初次渲染完成 |
| 92 | */ | 212 | */ |
| 93 | onReady: function () { | 213 | onReady: function () { |
| 214 | + // var self = this; | ||
| 215 | + // this.updateLiveList().then(() => { | ||
| 216 | + // self.loadLiveList(1); | ||
| 217 | + // }); | ||
| 94 | 218 | ||
| 219 | + var self = this; | ||
| 220 | + this.updateLiveList().then(() => { | ||
| 221 | + self.getData(101); | ||
| 222 | + self.getData(102); | ||
| 223 | + self.getData(103); | ||
| 224 | + }); | ||
| 95 | }, | 225 | }, |
| 96 | 226 | ||
| 97 | /** | 227 | /** |
| @@ -119,20 +249,64 @@ Page({ | @@ -119,20 +249,64 @@ Page({ | ||
| 119 | * 页面相关事件处理函数--监听用户下拉动作 | 249 | * 页面相关事件处理函数--监听用户下拉动作 |
| 120 | */ | 250 | */ |
| 121 | onPullDownRefresh: function () { | 251 | onPullDownRefresh: function () { |
| 122 | - | 252 | + // var self = this; |
| 253 | + // wx.showNavigationBarLoading(); //在标题栏中显示加载 | ||
| 254 | + // setTimeout(function() { | ||
| 255 | + // self.loadLiveList(1); | ||
| 256 | + // wx.hideNavigationBarLoading(); //完成停止加载 | ||
| 257 | + // wx.stopPullDownRefresh(); //停止下拉刷新 | ||
| 258 | + // }, 500); | ||
| 123 | }, | 259 | }, |
| 124 | 260 | ||
| 125 | /** | 261 | /** |
| 126 | * 页面上拉触底事件的处理函数 | 262 | * 页面上拉触底事件的处理函数 |
| 127 | */ | 263 | */ |
| 128 | onReachBottom: function () { | 264 | onReachBottom: function () { |
| 265 | + var self = this; | ||
| 266 | + var curPage = this.data.curPage; | ||
| 267 | + console.log('now curPage',curPage); | ||
| 268 | + var pageNum = this.data.pageNum; | ||
| 269 | + console.log('now pageNum',pageNum); | ||
| 129 | 270 | ||
| 271 | + if (curPage <= pageNum) { | ||
| 272 | + wx.showLoading({ | ||
| 273 | + title: '加载中...', | ||
| 274 | + }) | ||
| 275 | + setTimeout(function () { | ||
| 276 | + self.loadLiveList(curPage); | ||
| 277 | + wx.hideLoading(); | ||
| 278 | + }, 500); | ||
| 279 | + } else { | ||
| 280 | + wx.showToast({ | ||
| 281 | + title: '已经到底啦~', | ||
| 282 | + duration: 1000 | ||
| 283 | + }) | ||
| 284 | + } | ||
| 130 | }, | 285 | }, |
| 131 | 286 | ||
| 132 | /** | 287 | /** |
| 133 | * 用户点击右上角分享 | 288 | * 用户点击右上角分享 |
| 134 | */ | 289 | */ |
| 135 | onShareAppMessage: function () { | 290 | onShareAppMessage: function () { |
| 291 | + if (res.from === 'button') { | ||
| 292 | + // 来自页面内转发按钮 | ||
| 293 | + console.log(res.target) | ||
| 294 | + } | ||
| 295 | + return { | ||
| 296 | + title: '直播列表' | ||
| 297 | + // path: '/page/user?id=123' | ||
| 298 | + } | ||
| 299 | + }, | ||
| 300 | + | ||
| 301 | + onShareTimeline: function (res) { | ||
| 302 | + if (res.from === 'button') { | ||
| 303 | + // 来自页面内转发按钮 | ||
| 304 | + console.log(res.target) | ||
| 305 | + } | ||
| 306 | + return { | ||
| 307 | + title: '直播列表' | ||
| 308 | + // path: '/page/user?id=123' | ||
| 309 | + } | ||
| 310 | + }, | ||
| 136 | 311 | ||
| 137 | - } | ||
| 138 | }) | 312 | }) |
| 139 | \ No newline at end of file | 313 | \ No newline at end of file |
packageA/pages/liveStream/liveStream.json
| @@ -2,5 +2,8 @@ | @@ -2,5 +2,8 @@ | ||
| 2 | "usingComponents": { | 2 | "usingComponents": { |
| 3 | "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe" | 3 | "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe" |
| 4 | }, | 4 | }, |
| 5 | - "navigationBarTitleText": "直播" | ||
| 6 | -} | ||
| 7 | \ No newline at end of file | 5 | \ No newline at end of file |
| 6 | + "navigationBarTitleText": "直播", | ||
| 7 | + "onReachBottomDistance": 300 | ||
| 8 | +} | ||
| 9 | + | ||
| 10 | + | ||
| 8 | \ No newline at end of file | 11 | \ No newline at end of file |
packageA/pages/liveStream/liveStream.wxml
| @@ -3,41 +3,44 @@ | @@ -3,41 +3,44 @@ | ||
| 3 | <view> | 3 | <view> |
| 4 | <block wx:if="{{live === '{}'}}">当前暂无直播</block> | 4 | <block wx:if="{{live === '{}'}}">当前暂无直播</block> |
| 5 | <!-- 即将开始 --> | 5 | <!-- 即将开始 --> |
| 6 | - <block wx:if="{{live.toBegin.length > 0}}"> | 6 | + <block wx:if="{{livetoBegin.length > 0}}"> |
| 7 | <view class="title">即将开始</view> | 7 | <view class="title">即将开始</view> |
| 8 | <view class="list"> | 8 | <view class="list"> |
| 9 | - <block wx:for="{{live.toBegin}}"> | 9 | + <block wx:for="{{livetoBegin}}" wx:key="item"> |
| 10 | <view class="list-item" data-id="{{item.id}}" data-live="toBegin" catchtap="clickItem"> | 10 | <view class="list-item" data-id="{{item.id}}" data-live="toBegin" catchtap="clickItem"> |
| 11 | <view class="list-item-left"> | 11 | <view class="list-item-left"> |
| 12 | - <image src="{{item.cover_img}}" class="item-pic" mode="aspectFill"></image> | ||
| 13 | - <!-- <view class="item-desc"> | ||
| 14 | - <view>{{item.name}}</view> | ||
| 15 | - <view>{{filter.format_time(item.start_time)}}</view> | ||
| 16 | - </view> --> | 12 | + <image src="{{item.share_img}}" class="item-pic" mode="aspectFill"></image> |
| 17 | </view> | 13 | </view> |
| 18 | <view class="list-item-right"> | 14 | <view class="list-item-right"> |
| 19 | - <view class="item-title">{{item.name}}</view> | 15 | + <view> |
| 16 | + <view class="item-title">{{item.name}}</view> | ||
| 17 | + <view class="item-time">{{filter.format_time(item.start_time, 2)}} 开始</view> | ||
| 18 | + <view class="item-anchor">主播：{{item['anchor_name']}}</view> | ||
| 19 | + </view> | ||
| 20 | <subscribe room-id="{{item.roomid}}" stopPropagation="{{true}}"></subscribe> | 20 | <subscribe room-id="{{item.roomid}}" stopPropagation="{{true}}"></subscribe> |
| 21 | </view> | 21 | </view> |
| 22 | - | ||
| 23 | </view> | 22 | </view> |
| 24 | - | 23 | + |
| 25 | </block> | 24 | </block> |
| 26 | </view> | 25 | </view> |
| 27 | </block> | 26 | </block> |
| 28 | 27 | ||
| 29 | 28 | ||
| 30 | <!-- 直播中 --> | 29 | <!-- 直播中 --> |
| 31 | - <block wx:if="{{live.ing.length > 0}}"> | 30 | + <block wx:if="{{liveing.length > 0}}"> |
| 32 | <view class="title">直播中</view> | 31 | <view class="title">直播中</view> |
| 33 | <view class="list"> | 32 | <view class="list"> |
| 34 | - <block wx:for="{{live.ing}}"> | 33 | + <block wx:for="{{liveing}}" wx:key="item"> |
| 35 | <view class="list-item" catchtap="clickItem" data-id="{{item.id}}" data-live="ing"> | 34 | <view class="list-item" catchtap="clickItem" data-id="{{item.id}}" data-live="ing"> |
| 36 | <view class="list-item-left"> | 35 | <view class="list-item-left"> |
| 37 | - <image src="{{item.cover_img}}" class="item-pic" mode="aspectFill"></image> | 36 | + <image src="{{item.share_img}}" class="item-pic" mode="aspectFill"></image> |
| 38 | </view> | 37 | </view> |
| 39 | <view class="list-item-right"> | 38 | <view class="list-item-right"> |
| 40 | - <view class="item-title">{{item.name}}</view> | 39 | + <view> |
| 40 | + <view class="item-title">{{item.name}}</view> | ||
| 41 | + <view class="item-time">{{filter.format_time(item.start_time, 2)}} 开始</view> | ||
| 42 | + <view class="item-anchor">主播：{{item['anchor_name']}}</view> | ||
| 43 | + </view> | ||
| 41 | <view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}">观看直播</view> | 44 | <view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}">观看直播</view> |
| 42 | </view> | 45 | </view> |
| 43 | </view> | 46 | </view> |
| @@ -47,16 +50,20 @@ | @@ -47,16 +50,20 @@ | ||
| 47 | 50 | ||
| 48 | 51 | ||
| 49 | <!-- 精彩回放 --> | 52 | <!-- 精彩回放 --> |
| 50 | - <block wx:if="{{live.over.length > 0}}"> | 53 | + <block wx:if="{{liveOver.length > 0}}"> |
| 51 | <view class="title">精彩回放</view> | 54 | <view class="title">精彩回放</view> |
| 52 | <view class="list"> | 55 | <view class="list"> |
| 53 | - <block wx:for="{{live.over}}"> | 56 | + <block wx:for="{{liveOver}}" wx:key="item"> |
| 54 | <view class="list-item" bindtap="clickItem" data-id="{{item.id}}" data-live="over"> | 57 | <view class="list-item" bindtap="clickItem" data-id="{{item.id}}" data-live="over"> |
| 55 | <view class="list-item-left"> | 58 | <view class="list-item-left"> |
| 56 | - <image src="{{item.cover_img}}" class="item-pic" mode="aspectFill"></image> | 59 | + <image src="{{item.share_img}}" class="item-pic" mode="aspectFill"></image> |
| 57 | </view> | 60 | </view> |
| 58 | <view class="list-item-right"> | 61 | <view class="list-item-right"> |
| 59 | - <view class="item-title">{{item.name}}</view> | 62 | + <view> |
| 63 | + <view class="item-title">{{item.name}}</view> | ||
| 64 | + <view class="item-time">{{filter.format_time(item.end_time, 2)}} 结束</view> | ||
| 65 | + <view class="item-anchor">主播：{{item['anchor_name']}}</view> | ||
| 66 | + </view> | ||
| 60 | <view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}">观看回放</view> | 67 | <view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}">观看回放</view> |
| 61 | </view> | 68 | </view> |
| 62 | </view> | 69 | </view> |
packageA/pages/liveStream/liveStream.wxss
| @@ -9,8 +9,8 @@ | @@ -9,8 +9,8 @@ | ||
| 9 | } | 9 | } |
| 10 | .list-item-left { | 10 | .list-item-left { |
| 11 | position: relative; | 11 | position: relative; |
| 12 | - width: 300rpx; | ||
| 13 | - height: 300rpx; | 12 | + width: 340rpx; |
| 13 | + height: 220rpx; | ||
| 14 | flex-shrink: 0; | 14 | flex-shrink: 0; |
| 15 | } | 15 | } |
| 16 | .list-item-right { | 16 | .list-item-right { |
| @@ -55,9 +55,18 @@ | @@ -55,9 +55,18 @@ | ||
| 55 | 55 | ||
| 56 | display: -webkit-box; | 56 | display: -webkit-box; |
| 57 | -webkit-box-orient: vertical; | 57 | -webkit-box-orient: vertical; |
| 58 | - -webkit-line-clamp: 4; | 58 | + -webkit-line-clamp: 2; |
| 59 | overflow: hidden; | 59 | overflow: hidden; |
| 60 | } | 60 | } |
| 61 | +.item-time { | ||
| 62 | + color: #999; | ||
| 63 | + font-size: 22rpx; | ||
| 64 | + padding-top: 10rpx; | ||
| 65 | +} | ||
| 66 | +.item-anchor { | ||
| 67 | + color: #999; | ||
| 68 | + font-size: 22rpx; | ||
| 69 | +} | ||
| 61 | 70 | ||
| 62 | .item-btn { | 71 | .item-btn { |
| 63 | width: 172rpx; | 72 | width: 172rpx; |
packageA/pages/liveStreamDetails/liveStreamDetails.js
| @@ -29,7 +29,11 @@ Page({ | @@ -29,7 +29,11 @@ Page({ | ||
| 29 | nickName: '', | 29 | nickName: '', |
| 30 | avatarUrl: '', | 30 | avatarUrl: '', |
| 31 | coverImg: '', | 31 | coverImg: '', |
| 32 | - canvasToImgPath: '' | 32 | + canvasToImgPath: '', |
| 33 | + screenWidth: 0, | ||
| 34 | + canvasHidden: 1, | ||
| 35 | + gid: '', | ||
| 36 | + shareImgPath: '' | ||
| 33 | }, | 37 | }, |
| 34 | 38 | ||
| 35 | // 点击商品 | 39 | // 点击商品 |
| @@ -59,21 +63,31 @@ Page({ | @@ -59,21 +63,31 @@ Page({ | ||
| 59 | this.setData({ | 63 | this.setData({ |
| 60 | showActionSheet: 'false' | 64 | showActionSheet: 'false' |
| 61 | }) | 65 | }) |
| 66 | + if(!this.data.showPlaybill) { | ||
| 67 | + this.setData({ | ||
| 68 | + showPlaybill: 'true' | ||
| 69 | + }); | ||
| 70 | + } | ||
| 71 | + }, | ||
| 72 | + | ||
| 73 | + closeWin: function () { | ||
| 74 | + this.setData({ | ||
| 75 | + showPlaybill: 'true' | ||
| 76 | + }); | ||
| 62 | }, | 77 | }, |
| 63 | 78 | ||
| 64 | //生成海报 | 79 | //生成海报 |
| 65 | createPlaybill: function () { | 80 | createPlaybill: function () { |
| 66 | // 1.提示 “正在生成海报...” | 81 | // 1.提示 “正在生成海报...” |
| 67 | - wx.showLoading({ | ||
| 68 | - title: '正在生成海报...' | ||
| 69 | - }); | 82 | + |
| 70 | // 2.生成海报，如果生成完毕,关闭提示 | 83 | // 2.生成海报，如果生成完毕,关闭提示 |
| 71 | this.drawPlaybill(); | 84 | this.drawPlaybill(); |
| 72 | // 3.展示生成的海报 | 85 | // 3.展示生成的海报 |
| 73 | this.setData({ | 86 | this.setData({ |
| 74 | - showPlaybill: !this.data.showPlaybill, | ||
| 75 | - showActionSheet: 'false' | 87 | + showActionSheet: 'false', |
| 88 | + showPlaybill: !this.data.showPlaybill | ||
| 76 | }); | 89 | }); |
| 90 | + | ||
| 77 | }, | 91 | }, |
| 78 | 92 | ||
| 79 | // 获取设备信息 | 93 | // 获取设备信息 |
| @@ -84,150 +98,153 @@ Page({ | @@ -84,150 +98,153 @@ Page({ | ||
| 84 | that.setData({ | 98 | that.setData({ |
| 85 | windowWidth: res.windowWidth, | 99 | windowWidth: res.windowWidth, |
| 86 | windowHeight: res.windowHeight, | 100 | windowHeight: res.windowHeight, |
| 101 | + screenWidth: res.screenWidth, | ||
| 87 | dpr: res.pixelRatio | 102 | dpr: res.pixelRatio |
| 88 | }) | 103 | }) |
| 89 | } | 104 | } |
| 90 | }); | 105 | }); |
| 106 | + console.log('宽度',this.data.windowWidth); | ||
| 107 | + console.log('高度',this.data.windowHeight); | ||
| 91 | }, | 108 | }, |
| 92 | 109 | ||
| 93 | - //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 | ||
| 94 | - drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) { | ||
| 95 | - var lineWidth = 0; | ||
| 96 | - var lastSubStrIndex = 0; //每次开始截取的字符串的索引 | ||
| 97 | - var han = 0; | ||
| 98 | - for (let i = 0; i < str.length; i++) { | ||
| 99 | - if (han == 2) return; | ||
| 100 | - //lineWidth += ctx.measureText(str[i]).width; | ||
| 101 | - lineWidth += ut.measureText(str[i], 21.3 * unit); | ||
| 102 | - if (lineWidth > canvasWidth) { | ||
| 103 | - han++; | ||
| 104 | - | ||
| 105 | - if (han == 2) { | ||
| 106 | - ctx.textAlign = 'justify'; | ||
| 107 | - ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分 | ||
| 108 | - } else { | ||
| 109 | - ctx.textAlign = 'justify'; | ||
| 110 | - ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight); | ||
| 111 | - } | ||
| 112 | - initHeight += 22; //22为字体的高度 | ||
| 113 | - lineWidth = 0; | ||
| 114 | - lastSubStrIndex = i; | ||
| 115 | - titleHeight += 20; | ||
| 116 | - } | ||
| 117 | - if (i == str.length - 1) { //绘制剩余部分 | ||
| 118 | - ctx.textAlign = 'justify'; | ||
| 119 | - ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight); | ||
| 120 | - } | 110 | +//文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 |
| 111 | +drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) { | ||
| 112 | + var lineWidth = 0; | ||
| 113 | + var lastSubStrIndex = 0; //每次开始截取的字符串的索引 | ||
| 114 | + var han = 0; | ||
| 115 | + for (let i = 0; i < str.length; i++) { | ||
| 116 | + if (han == 2) return; | ||
| 117 | + //lineWidth += ctx.measureText(str[i]).width; | ||
| 118 | + lineWidth += ut.measureText(str[i], 21.3 * unit); | ||
| 119 | + if (lineWidth > canvasWidth) { | ||
| 120 | + han++; | ||
| 121 | + | ||
| 122 | + if (han == 2) { | ||
| 123 | + ctx.textAlign = 'justify'; | ||
| 124 | + ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分 | ||
| 125 | + } else { | ||
| 126 | + ctx.textAlign = 'justify'; | ||
| 127 | + ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight); | ||
| 121 | } | 128 | } |
| 122 | - }, | 129 | + initHeight += 35; //22为字体的高度 |
| 130 | + lineWidth = 0; | ||
| 131 | + lastSubStrIndex = i; | ||
| 132 | + titleHeight += 20; | ||
| 133 | + } | ||
| 134 | + if (i == str.length - 1) { //绘制剩余部分 | ||
| 135 | + ctx.textAlign = 'justify'; | ||
| 136 | + ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight); | ||
| 137 | + } | ||
| 138 | + } | ||
| 139 | +}, | ||
| 123 | 140 | ||
| 124 | // 生成海报 | 141 | // 生成海报 |
| 125 | drawPlaybill: function () { | 142 | drawPlaybill: function () { |
| 126 | - var that = this | 143 | + wx.showLoading({ |
| 144 | + title: '正在生成海报...' | ||
| 145 | + }); | ||
| 146 | + | ||
| 147 | + // 数据准备 | ||
| 148 | + const title = this.data.details.name; | ||
| 149 | + // const headImg = app.globalData.userInfo['head_pic']; | ||
| 150 | + const that = this; | ||
| 151 | + | ||
| 152 | + // console.log('----------------v', headImg); | ||
| 153 | + | ||
| 154 | + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | ||
| 155 | + os.stoid + "?sceneValue=1012" + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails"; | ||
| 156 | + | ||
| 157 | + // 以iPhone6为例，375/750 = 0.5 | ||
| 158 | + // let scale = this.data.windowWidth / 375; | ||
| 159 | + let scale = this.data.screenWidth / 750 * 1.35 | ||
| 160 | + | ||
| 161 | + | ||
| 127 | // 适配屏get幕 | 162 | // 适配屏get幕 |
| 128 | - let scale = this.data.windowWidth / 375.0 | ||
| 129 | - | ||
| 130 | - this.setData({ totalHeight: 667*scale}) | 163 | + // let scale = this.data.windowWidth / 375.0; |
| 164 | + // this.setData({totalHeight: 667 * scale}); | ||
| 165 | + | ||
| 131 | // 获取Canvas | 166 | // 获取Canvas |
| 132 | - let ctx = wx.createCanvasContext('myCanvas') | 167 | + let ctx = wx.createCanvasContext('myCanvas'); |
| 133 | 168 | ||
| 134 | // 放大 因为不放大的话，生成的分享图会模糊。暂时先注释 | 169 | // 放大 因为不放大的话，生成的分享图会模糊。暂时先注释 |
| 135 | - ctx.scale(this.data.canvasScale, this.data.canvasScale) | 170 | + // ctx.scale(this.data.canvasScale, this.data.canvasScale) |
| 171 | + | ||
| 136 | 172 | ||
| 137 | - // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | ||
| 138 | - // os.stoid; | ||
| 139 | 173 | ||
| 140 | - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | ||
| 141 | - os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | ||
| 142 | - + "?sceneValue=1012" + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails" | 174 | + // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
| 175 | + // os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | ||
| 176 | + // + "?sceneValue=1012" + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails" | ||
| 143 | // console.log('path3---->', path3); | 177 | // console.log('path3---->', path3); |
| 144 | 178 | ||
| 145 | 179 | ||
| 146 | // 绘制主背景白色 | 180 | // 绘制主背景白色 |
| 147 | - ctx.setFillStyle('#ffffff') | ||
| 148 | - ctx.fillRect(0, 0, this.data.windowWidth, this.data.totalHeight) | ||
| 149 | - ctx.draw(true); | ||
| 150 | - | ||
| 151 | - | ||
| 152 | - const coverImag = this.data.details['cover_img']; | ||
| 153 | - const title = this.data.details.name; | ||
| 154 | - console.log('detail--->', this.data.details); | ||
| 155 | - | ||
| 156 | - | ||
| 157 | - //绘制头像 | ||
| 158 | - wx.getImageInfo({ | ||
| 159 | - src: that.data.avatarUrl, | ||
| 160 | - success: function(res) { | ||
| 161 | - ctx.save(); | ||
| 162 | - ctx.beginPath(); | ||
| 163 | - ctx.arc(29*scale, 27*scale, 14*scale, 0, 2*Math.PI); | ||
| 164 | - ctx.clip(); | ||
| 165 | - ctx.drawImage(res.path, 15*scale, 13*scale, 28*scale, 28*scale); | ||
| 166 | - ctx.restore() | ||
| 167 | - ctx.draw(true); | ||
| 168 | - } | ||
| 169 | - }) | 181 | + ctx.setFillStyle('#ffffff'); |
| 182 | + ctx.fillRect(0, 0, 480, 738); | ||
| 183 | + | ||
| 184 | + // 绘制头像 | ||
| 185 | + ctx.save(); | ||
| 186 | + ctx.beginPath(); | ||
| 187 | + ctx.arc(58, 52, 28, 0, 2*Math.PI); | ||
| 188 | + ctx.clip(); | ||
| 189 | + // console.log('1__________________>',app.globalData.userInfo['head_pic']); | ||
| 190 | + ctx.drawImage(this.data.avatarUrl, 30, 24, 56, 56); | ||
| 191 | + ctx.restore(); | ||
| 170 | 192 | ||
| 171 | // 绘制昵称 | 193 | // 绘制昵称 |
| 172 | - ctx.setFontSize(12*scale); | 194 | + ctx.setFontSize(22); |
| 173 | ctx.setFillStyle('#ADADAD'); | 195 | ctx.setFillStyle('#ADADAD'); |
| 174 | - ctx.fillText(this.data.nickName, 54*scale, 32*scale); | 196 | + ctx.fillText(this.data.nickName, 106, 60); |
| 175 | 197 | ||
| 176 | - //绘制主图 | ||
| 177 | - wx.getImageInfo({ | ||
| 178 | - src: coverImag, | ||
| 179 | - success: function(res) { | ||
| 180 | - ctx.drawImage(res.path, 0, 52*scale, 240*scale, 191*scale); | ||
| 181 | - ctx.draw(true); | ||
| 182 | - } | ||
| 183 | - }) | 198 | + // 绘制主图 |
| 199 | + ctx.drawImage(this.data.coverImg, 0, 104, 480, 382); | ||
| 200 | + // ctx.draw(true); | ||
| 184 | 201 | ||
| 185 | - //绘制文字 | ||
| 186 | - ctx.setFontSize(14*scale); | 202 | + // 绘制文字 |
| 203 | + ctx.setFontSize(24); | ||
| 187 | ctx.setFillStyle('#1E1E1E'); | 204 | ctx.setFillStyle('#1E1E1E'); |
| 188 | - // ctx.fillText(title, 10*scale, 281*scale, 97*scale); | ||
| 189 | - this.drawText(ctx, title, 10*scale, 281*scale, 130*scale, 130*scale, scale); | ||
| 190 | - // ctx.draw(true); | 205 | + this.drawText(ctx, title, 51, 563, 300, 360, 2); |
| 191 | 206 | ||
| 192 | - //绘制小程序码 | ||
| 193 | - wx.getImageInfo({ | ||
| 194 | - src: path3, | ||
| 195 | - success: function(res) { | ||
| 196 | - ctx.drawImage(res.path, 152*scale, 262*scale, 66*scale, 66*scale); | ||
| 197 | - ctx.draw(true); | ||
| 198 | - } | ||
| 199 | - }) | 207 | + // 绘制小程序码 |
| 208 | + ctx.drawImage(this.data.ewm, 310, 525, 132, 132); | ||
| 209 | + // ctx.draw(true); | ||
| 200 | 210 | ||
| 201 | - //绘制文字：常按识别 | ||
| 202 | - ctx.setFontSize(14*scale); | 211 | + //绘制文字：长按识别 |
| 212 | + ctx.setFontSize(20); | ||
| 203 | ctx.setFillStyle('#1E1E1E'); | 213 | ctx.setFillStyle('#1E1E1E'); |
| 204 | - ctx.fillText('长按识别小程序', 135*scale, 350*scale); | 214 | + ctx.fillText('长按识别小程序', 309, 675); |
| 205 | 215 | ||
| 206 | - | ||
| 207 | - //把画板内容绘制成图片，并回调 画板图片路径 | ||
| 208 | ctx.draw(true, function() { | 216 | ctx.draw(true, function() { |
| 209 | setTimeout(function() { | 217 | setTimeout(function() { |
| 218 | + console.log("我进来了~~~~~"); | ||
| 210 | wx.canvasToTempFilePath({ | 219 | wx.canvasToTempFilePath({ |
| 211 | x: 0, | 220 | x: 0, |
| 212 | y: 0, | 221 | y: 0, |
| 213 | - destWidth: that.data.windowWidth*2, | ||
| 214 | - destHeight: that.data.windowHeight*2, | ||
| 215 | - fileType: 'jpg', | ||
| 216 | - quality: 1, | 222 | + width: 750, |
| 223 | + height: 1217, | ||
| 224 | + destWidth: 750, | ||
| 225 | + destHeight: 1217, | ||
| 217 | canvasId: 'myCanvas', | 226 | canvasId: 'myCanvas', |
| 227 | + fileType: 'jpg', | ||
| 218 | success: function(res) { | 228 | success: function(res) { |
| 219 | wx.hideLoading(); | 229 | wx.hideLoading(); |
| 220 | that.setData({ | 230 | that.setData({ |
| 221 | - canvasToImgPath: res.tempFilePath, | 231 | + canvasToImgPath: res.tempFilePath |
| 222 | }); | 232 | }); |
| 223 | - console.log(res.tempFilePath); | 233 | + // that.saveImageToPhotosAlbum(res.tempFilePath); |
| 234 | + console.log('截图陈宫：', that.data.canvasToImgPath); | ||
| 235 | + // wx.previewImage({ | ||
| 236 | + // //将图片预览出来 | ||
| 237 | + // urls: [that.data.canvasToImgPath] | ||
| 238 | + // }); | ||
| 224 | } | 239 | } |
| 225 | }) | 240 | }) |
| 226 | - }, 3000) | 241 | + }, 1000) |
| 227 | }); | 242 | }); |
| 228 | - }, | ||
| 229 | 243 | ||
| 230 | - | 244 | + |
| 245 | + | ||
| 246 | + }, | ||
| 247 | + | ||
| 231 | 248 | ||
| 232 | //点击观看直播 | 249 | //点击观看直播 |
| 233 | clickBtn: function () { | 250 | clickBtn: function () { |
| @@ -240,17 +257,18 @@ Page({ | @@ -240,17 +257,18 @@ Page({ | ||
| 240 | 257 | ||
| 241 | // 保存图片到手机 | 258 | // 保存图片到手机 |
| 242 | onSaveToPhone() { | 259 | onSaveToPhone() { |
| 260 | + var self = this; | ||
| 243 | // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限 | 261 | // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限 |
| 244 | this.getSetting().then((res) => { | 262 | this.getSetting().then((res) => { |
| 245 | // 判断用户是否授权了保存到相册的权限，如果没有发起授权 | 263 | // 判断用户是否授权了保存到相册的权限，如果没有发起授权 |
| 246 | if (!res.authSetting['scope.writePhotosAlbum']) { | 264 | if (!res.authSetting['scope.writePhotosAlbum']) { |
| 247 | this.authorize().then(() => { | 265 | this.authorize().then(() => { |
| 248 | // 同意授权后保存下载文件 | 266 | // 同意授权后保存下载文件 |
| 249 | - this.savedownloadFile(this.data.canvasToImgPath) | 267 | + this.saveImageToPhotosAlbum(self.data.canvasToImgPath) |
| 250 | }) | 268 | }) |
| 251 | } else { | 269 | } else { |
| 252 | // 如果已经授权，保存下载文件 | 270 | // 如果已经授权，保存下载文件 |
| 253 | - this.savedownloadFile(this.data.canvasToImgPath) | 271 | + this.saveImageToPhotosAlbum(self.data.canvasToImgPath) |
| 254 | } | 272 | } |
| 255 | }) | 273 | }) |
| 256 | }, | 274 | }, |
| @@ -259,7 +277,7 @@ Page({ | @@ -259,7 +277,7 @@ Page({ | ||
| 259 | onOpenSetting() { | 277 | onOpenSetting() { |
| 260 | wx.openSetting({ | 278 | wx.openSetting({ |
| 261 | success:(res) => { | 279 | success:(res) => { |
| 262 | - console.log(res.authSetting) | 280 | + // console.log(res.authSetting) |
| 263 | } | 281 | } |
| 264 | }) | 282 | }) |
| 265 | }, | 283 | }, |
| @@ -269,7 +287,6 @@ Page({ | @@ -269,7 +287,6 @@ Page({ | ||
| 269 | return new Promise((resolve, reject) => { | 287 | return new Promise((resolve, reject) => { |
| 270 | wx.getSetting({ | 288 | wx.getSetting({ |
| 271 | success: res => { | 289 | success: res => { |
| 272 | - console.log('getting---->', res); | ||
| 273 | resolve(res) | 290 | resolve(res) |
| 274 | } | 291 | } |
| 275 | }) | 292 | }) |
| @@ -286,7 +303,7 @@ Page({ | @@ -286,7 +303,7 @@ Page({ | ||
| 286 | scope: 'scope.writePhotosAlbum', | 303 | scope: 'scope.writePhotosAlbum', |
| 287 | // 同意授权 | 304 | // 同意授权 |
| 288 | success: () => { | 305 | success: () => { |
| 289 | - resolve() | 306 | + resolve(); |
| 290 | }, | 307 | }, |
| 291 | // 拒绝授权,这里是用户拒绝授权后的回调 | 308 | // 拒绝授权,这里是用户拒绝授权后的回调 |
| 292 | fail: res => { | 309 | fail: res => { |
| @@ -298,10 +315,10 @@ Page({ | @@ -298,10 +315,10 @@ Page({ | ||
| 298 | duration: 1000 | 315 | duration: 1000 |
| 299 | }) | 316 | }) |
| 300 | } else { | 317 | } else { |
| 301 | - this.showModal() | 318 | + this.showModal(); |
| 302 | } | 319 | } |
| 303 | console.log('拒绝授权'); | 320 | console.log('拒绝授权'); |
| 304 | - reject() | 321 | + reject(); |
| 305 | } | 322 | } |
| 306 | }) | 323 | }) |
| 307 | }) | 324 | }) |
| @@ -311,12 +328,14 @@ Page({ | @@ -311,12 +328,14 @@ Page({ | ||
| 311 | savedownloadFile(img) { | 328 | savedownloadFile(img) { |
| 312 | this.downLoadFile(img).then((res) => { | 329 | this.downLoadFile(img).then((res) => { |
| 313 | return this.saveImageToPhotosAlbum(res.tempFilePath) | 330 | return this.saveImageToPhotosAlbum(res.tempFilePath) |
| 314 | - }).then(() => { | 331 | + }).then(() => { |
| 332 | + // resolve() | ||
| 315 | }) | 333 | }) |
| 316 | }, | 334 | }, |
| 317 | 335 | ||
| 318 | //单文件下载(下载文件资源到本地)，客户端直接发起一个 HTTPS GET 请求，返回文件的本地临时路径。 | 336 | //单文件下载(下载文件资源到本地)，客户端直接发起一个 HTTPS GET 请求，返回文件的本地临时路径。 |
| 319 | downLoadFile(img) { | 337 | downLoadFile(img) { |
| 338 | + var self = this; | ||
| 320 | return new Promise((resolve, reject) => { | 339 | return new Promise((resolve, reject) => { |
| 321 | wx.showLoading({ | 340 | wx.showLoading({ |
| 322 | title: '保存中...', | 341 | title: '保存中...', |
| @@ -325,8 +344,7 @@ Page({ | @@ -325,8 +344,7 @@ Page({ | ||
| 325 | wx.downloadFile({ | 344 | wx.downloadFile({ |
| 326 | url: img, | 345 | url: img, |
| 327 | success: (res) => { | 346 | success: (res) => { |
| 328 | - console.log('downloadfile', res) | ||
| 329 | - resolve(res) | 347 | + resolve(res); |
| 330 | } | 348 | } |
| 331 | }) | 349 | }) |
| 332 | }) | 350 | }) |
| @@ -346,7 +364,13 @@ Page({ | @@ -346,7 +364,13 @@ Page({ | ||
| 346 | self.setData({ | 364 | self.setData({ |
| 347 | showPlaybill: 'true' | 365 | showPlaybill: 'true' |
| 348 | }); | 366 | }); |
| 349 | - resolve() | 367 | + resolve(); |
| 368 | + }, | ||
| 369 | + fail: () => { | ||
| 370 | + wx.showToast({ | ||
| 371 | + title: '保存失败', | ||
| 372 | + duration: 1000, | ||
| 373 | + }); | ||
| 350 | } | 374 | } |
| 351 | }) | 375 | }) |
| 352 | }) | 376 | }) |
| @@ -384,6 +408,34 @@ Page({ | @@ -384,6 +408,34 @@ Page({ | ||
| 384 | that.setData({ | 408 | that.setData({ |
| 385 | details: obj | 409 | details: obj |
| 386 | }) | 410 | }) |
| 411 | + | ||
| 412 | + | ||
| 413 | + // 请求主图 | ||
| 414 | + that.getImageInfo(that.data.details['share_img']).then(res => { | ||
| 415 | + that.setData({ | ||
| 416 | + coverImg: res.path | ||
| 417 | + }); | ||
| 418 | + console.log('主图加载成功~') | ||
| 419 | + }); | ||
| 420 | + | ||
| 421 | + // 请求头像 | ||
| 422 | + that.getImageInfo(app.globalData.userInfo['head_pic']).then(res => { | ||
| 423 | + that.setData({ | ||
| 424 | + avatarUrl: res.path | ||
| 425 | + }); | ||
| 426 | + console.log('头像加载成功~') | ||
| 427 | + }); | ||
| 428 | + | ||
| 429 | + // 请求二维码 | ||
| 430 | + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | ||
| 431 | + os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | ||
| 432 | + that.getImageInfo(path3).then(res => { | ||
| 433 | + that.setData({ | ||
| 434 | + ewm: res.path | ||
| 435 | + }); | ||
| 436 | + console.log('二维码加载成功~') | ||
| 437 | + }); | ||
| 438 | + | ||
| 387 | } | 439 | } |
| 388 | }) | 440 | }) |
| 389 | 441 | ||
| @@ -409,22 +461,21 @@ Page({ | @@ -409,22 +461,21 @@ Page({ | ||
| 409 | } | 461 | } |
| 410 | 462 | ||
| 411 | this.setData({ | 463 | this.setData({ |
| 412 | - nickName: app.globalData.userInfo.nickname, | ||
| 413 | - avatarUrl: app.globalData.userInfo.head_pic | 464 | + nickName: app.globalData.userInfo.nickname |
| 414 | }) | 465 | }) |
| 415 | 466 | ||
| 416 | - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | ||
| 417 | - os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | ||
| 418 | - wx.getImageInfo({ | ||
| 419 | - src: path3, | ||
| 420 | - success: function(res) { | 467 | + // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
| 468 | + // os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | ||
| 469 | + // wx.getImageInfo({ | ||
| 470 | + // src: path3, | ||
| 471 | + // success: function(res) { | ||
| 421 | // ctx.drawImage(res.path, 152*scale, 262*scale, 66*scale, 66*scale); | 472 | // ctx.drawImage(res.path, 152*scale, 262*scale, 66*scale, 66*scale); |
| 422 | // ctx.draw(true); | 473 | // ctx.draw(true); |
| 423 | - that.setData({ | ||
| 424 | - ewm: res.path | ||
| 425 | - }) | ||
| 426 | - } | ||
| 427 | - }) | 474 | + // that.setData({ |
| 475 | + // ewm: res.path | ||
| 476 | + // }) | ||
| 477 | + // } | ||
| 478 | + // }) | ||
| 428 | }, | 479 | }, |
| 429 | 480 | ||
| 430 | // 获取图片信息 | 481 | // 获取图片信息 |
| @@ -489,6 +540,10 @@ Page({ | @@ -489,6 +540,10 @@ Page({ | ||
| 489 | showActionSheet: 'false' | 540 | showActionSheet: 'false' |
| 490 | }) | 541 | }) |
| 491 | var self = this; | 542 | var self = this; |
| 543 | + if (res.from === 'button') { | ||
| 544 | + // 来自页面内转发按钮 | ||
| 545 | + console.log(res.target) | ||
| 546 | + } | ||
| 492 | return { | 547 | return { |
| 493 | title: this.data.details.name, | 548 | title: this.data.details.name, |
| 494 | success: function(res) { | 549 | success: function(res) { |
| @@ -498,5 +553,17 @@ Page({ | @@ -498,5 +553,17 @@ Page({ | ||
| 498 | console.log('comple', res) | 553 | console.log('comple', res) |
| 499 | } | 554 | } |
| 500 | } | 555 | } |
| 556 | + }, | ||
| 557 | + | ||
| 558 | + onShareTimeline: function (res) { | ||
| 559 | + if (res.from === 'button') { | ||
| 560 | + // 来自页面内转发按钮 | ||
| 561 | + console.log(res.target) | ||
| 562 | + } | ||
| 563 | + return { | ||
| 564 | + title: this.data.details.name | ||
| 565 | + // path: '/page/user?id=123' | ||
| 566 | + } | ||
| 501 | } | 567 | } |
| 568 | + | ||
| 502 | }) | 569 | }) |
packageA/pages/liveStreamDetails/liveStreamDetails.skeleton.wxml deleted
| 1 | -<!-- | ||
| 2 | -此文件为开发者工具生成，生成时间: 2020/7/4 下午3:58:01 | ||
| 3 | -使用方法： | ||
| 4 | -1. 在"packageA\pages\liveStreamDetails\liveStreamDetails.wxml"中使用`include`指令引入此模板， | ||
| 5 | -2. 在"packageA\pages\liveStreamDetails\liveStreamDetails.wxss"中使用`import`指令引入"packageA\pages\liveStreamDetails\liveStreamDetails.skeleton.wxss" | ||
| 6 | -3. 书写对应的逻辑，来控制骨架屏的显示与隐藏 | ||
| 7 | - | ||
| 8 | -更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html | ||
| 9 | ---> | ||
| 10 | -<view class="sk-container"></view> | ||
| 11 | \ No newline at end of file | 0 | \ No newline at end of file |
packageA/pages/liveStreamDetails/liveStreamDetails.skeleton.wxss deleted
| 1 | -/* | ||
| 2 | -此文件为开发者工具生成，生成时间: 2020/7/4 下午3:58:01 | ||
| 3 | -使用方法：参考 "packageA\pages\liveStreamDetails\liveStreamDetails.skeleton.wxml" | ||
| 4 | -*/ | ||
| 5 | -.sk-transparent { | ||
| 6 | - color: transparent !important; | ||
| 7 | - } | ||
| 8 | -.sk-container { | ||
| 9 | - position: absolute; | ||
| 10 | - overflow: hidden; | ||
| 11 | - top: 0; | ||
| 12 | - left: 0; | ||
| 13 | - right: 0; | ||
| 14 | - bottom: 0; | ||
| 15 | - z-index: 1000000; | ||
| 16 | - background-color: transparent; | ||
| 17 | - } |
packageA/pages/liveStreamDetails/liveStreamDetails.wxml
| @@ -5,22 +5,22 @@ | @@ -5,22 +5,22 @@ | ||
| 5 | <view class="content"> | 5 | <view class="content"> |
| 6 | <!-- 封面标题 --> | 6 | <!-- 封面标题 --> |
| 7 | <view class="cover-container"> | 7 | <view class="cover-container"> |
| 8 | - <image src="{{details.cover_img}}" class="cover-img" mode="aspectFill"></image> | 8 | + <image src="{{details.share_img}}" class="cover-img" mode="widthFix"></image> |
| 9 | <!-- <view class="cover-desc"> | 9 | <!-- <view class="cover-desc"> |
| 10 | <view>{{details.name}}</view> | 10 | <view>{{details.name}}</view> |
| 11 | - <view>{{filter.format_time(details.start_time)}}</view> | 11 | + <view>{{filter.format_time(details.startshare_time)}}</view> |
| 12 | </view> --> | 12 | </view> --> |
| 13 | </view> | 13 | </view> |
| 14 | 14 | ||
| 15 | <!-- 直播详情 --> | 15 | <!-- 直播详情 --> |
| 16 | <view class="desc-container"> | 16 | <view class="desc-container"> |
| 17 | <view class="desc-title">{{details.name}}</view> | 17 | <view class="desc-title">{{details.name}}</view> |
| 18 | + <view class="desc-content"> | ||
| 19 | + <view>{{filter.format_time(details.start_time, 2)}} 锁定直播</view> | ||
| 20 | + <!-- <view>护肤、彩妆、香氛群星汇聚，更有折扣买赠与神秘新品加持~</view> | ||
| 21 | + <view>多轮抽奖惊喜连连，不容错过！</view> --> | ||
| 22 | + </view> | ||
| 18 | <text class="desc-status">{{myUtils.liveStatus(details.live_status)}}</text> | 23 | <text class="desc-status">{{myUtils.liveStatus(details.live_status)}}</text> |
| 19 | - <!-- <view class="desc-content"> | ||
| 20 | - <view>6月24日20:00锁定直播 盘点年中 「上榜」好货！</view> | ||
| 21 | - <view>护肤、彩妆、香氛群星汇聚，更有折扣买赠与神秘新品加持~</view> | ||
| 22 | - <view>多轮抽奖惊喜连连，不容错过！</view> | ||
| 23 | - </view> --> | ||
| 24 | </view> | 24 | </view> |
| 25 | 25 | ||
| 26 | <!-- 列表 --> | 26 | <!-- 列表 --> |
| @@ -29,13 +29,13 @@ | @@ -29,13 +29,13 @@ | ||
| 29 | <block wx:for="{{details.goods}}"> | 29 | <block wx:for="{{details.goods}}"> |
| 30 | <view class="list-item" bindtap="clickgoods" data-url="{{item.url}}"> | 30 | <view class="list-item" bindtap="clickgoods" data-url="{{item.url}}"> |
| 31 | <!-- {{item}} --> | 31 | <!-- {{item}} --> |
| 32 | - <image src="{{item.cover_img}}" class="item-pic"></image> | 32 | + <image src="{{item.cover_img}}" class="item-pic" mode="aspectFit"></image> |
| 33 | <view class="item-desc-container"> | 33 | <view class="item-desc-container"> |
| 34 | <view class="item-desc"> | 34 | <view class="item-desc"> |
| 35 | <!-- <view>WEI</view> --> | 35 | <!-- <view>WEI</view> --> |
| 36 | <view>{{item.name}}</view> | 36 | <view>{{item.name}}</view> |
| 37 | </view> | 37 | </view> |
| 38 | - <view class="item-price">{{item.price}}</view> | 38 | + <view class="item-price">{{filter.toFix(item.price, 2)}}</view> |
| 39 | </view> | 39 | </view> |
| 40 | </view> | 40 | </view> |
| 41 | </block> | 41 | </block> |
| @@ -74,15 +74,19 @@ | @@ -74,15 +74,19 @@ | ||
| 74 | 74 | ||
| 75 | <!-- 生成海报 --> | 75 | <!-- 生成海报 --> |
| 76 | <view class="{{showPlaybill ? 'playbill':'playbill active'}}" hidden="{{showPlaybill}}"> | 76 | <view class="{{showPlaybill ? 'playbill':'playbill active'}}" hidden="{{showPlaybill}}"> |
| 77 | - <!-- <image src="{{canvasToImgPath}}" class="playbill-pic"></image> --> | ||
| 78 | - <canvas canvas-id="myCanvas" class="playbill-pic" style="width:{{windowWidth*dpr}};height:width:{{windowHeight*dpr}}"></canvas> | ||
| 79 | - <view class="playbill-save" bindtap="onSaveToPhone"> | ||
| 80 | - <image src="/packageA/images/liveStreamDetails/save.jpg"></image>保存至相册 | ||
| 81 | - </view> | 77 | + <image src="{{canvasToImgPath}}" class="playbill-pic" mode="widthFix" bindtap="closeWin"></image> |
| 78 | + <canvas canvas-id="myCanvas" catchtouchmove="true" style="width:480px;height:738px;position:absolute;left:5000%;"></canvas> | ||
| 79 | + <!-- style="width:{{windowWidth}}px;height:{{windowHeight}}px;" --> | ||
| 80 | + <view class="playbill-save" bindtap="onSaveToPhone">保存至相册</view> | ||
| 82 | </view> | 81 | </view> |
| 83 | 82 | ||
| 83 | + <!-- <canvas canvas-id="myCanvas" class="" catchtouchmove="true" style="width:{{windowWidth}}px;height:{{windowHeight}}px;"></canvas> --> | ||
| 84 | + | ||
| 84 | <!-- mask --> | 85 | <!-- mask --> |
| 85 | <!-- 这里mask必须强制放在actionsheet和playbill的后面 --> | 86 | <!-- 这里mask必须强制放在actionsheet和playbill的后面 --> |
| 86 | - <view class="mask" bindtap="hiddenActionSheet"></view> | 87 | + <view class="mask" bindtap="hiddenActionSheet" catchtouchmove="true"></view> |
| 87 | 88 | ||
| 88 | </view> | 89 | </view> |
| 90 | + | ||
| 91 | +<!-- <canvas canvas-id="myCanvas" class="" catchtouchmove="true" style="width:480px;height:738px;position:absolute;left:5000%"></canvas> --> | ||
| 92 | +<!-- <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas> --> |
packageA/pages/liveStreamDetails/liveStreamDetails.wxss
| @@ -6,9 +6,10 @@ | @@ -6,9 +6,10 @@ | ||
| 6 | .content { | 6 | .content { |
| 7 | background-color: white; | 7 | background-color: white; |
| 8 | padding-bottom: 168rpx; | 8 | padding-bottom: 168rpx; |
| 9 | + position: relative; | ||
| 9 | } | 10 | } |
| 10 | .cover-container { | 11 | .cover-container { |
| 11 | - height: 646rpx; | 12 | + /* height: 646rpx; */ |
| 12 | position: relative; | 13 | position: relative; |
| 13 | } | 14 | } |
| 14 | .cover-img { | 15 | .cover-img { |
| @@ -53,11 +54,13 @@ | @@ -53,11 +54,13 @@ | ||
| 53 | line-height: 50rpx; | 54 | line-height: 50rpx; |
| 54 | padding: 0 30rpx; | 55 | padding: 0 30rpx; |
| 55 | background-color: #eee; | 56 | background-color: #eee; |
| 56 | - margin-top: 22rpx; | ||
| 57 | - margin-bottom: 44rpx; | 57 | + /* margin-top: 22rpx; |
| 58 | + margin-bottom: 44rpx; */ | ||
| 58 | } | 59 | } |
| 59 | .desc-content { | 60 | .desc-content { |
| 60 | font-size: 29rpx; | 61 | font-size: 29rpx; |
| 62 | + padding-top: 22rpx; | ||
| 63 | + padding-bottom: 22rpx; | ||
| 61 | } | 64 | } |
| 62 | .list { | 65 | .list { |
| 63 | padding: 0 36rpx; | 66 | padding: 0 36rpx; |
| @@ -103,8 +106,8 @@ | @@ -103,8 +106,8 @@ | ||
| 103 | } | 106 | } |
| 104 | .share-container image { | 107 | .share-container image { |
| 105 | display: block; | 108 | display: block; |
| 106 | - width: 60rpx; | ||
| 107 | - height: 60rpx; | 109 | + width: 50rpx; |
| 110 | + height: 50rpx; | ||
| 108 | padding-top: 14rpx; | 111 | padding-top: 14rpx; |
| 109 | padding-bottom: 11rpx; | 112 | padding-bottom: 11rpx; |
| 110 | } | 113 | } |
| @@ -220,12 +223,11 @@ | @@ -220,12 +223,11 @@ | ||
| 220 | } | 223 | } |
| 221 | .playbill-pic { | 224 | .playbill-pic { |
| 222 | display: block; | 225 | display: block; |
| 223 | - width: 478rpx; | ||
| 224 | - height: 737rpx; | ||
| 225 | - border-width: 31rpx 20rpx 51rpx; | ||
| 226 | - border-color: #f23030; | ||
| 227 | - border-style: solid; | 226 | + width: 560rpx; |
| 227 | + height: auto; | ||
| 228 | margin: 0 auto 26rpx; | 228 | margin: 0 auto 26rpx; |
| 229 | + border-radius: 10rpx; | ||
| 230 | + overflow: hidden; | ||
| 229 | } | 231 | } |
| 230 | 232 | ||
| 231 | .playbill-save { | 233 | .playbill-save { |
pages/cart/cart/cart.wxml
| @@ -107,7 +107,7 @@ | @@ -107,7 +107,7 @@ | ||
| 107 | </view> | 107 | </view> |
| 108 | </block> | 108 | </block> |
| 109 | </view> | 109 | </view> |
| 110 | - <view class="pay-for flex-vertical-between"> | 110 | + <view class="pay-for flex-vertical-between" style="bottom:{{tabBar.isIpx ? '172rpx' : '100rpx'}}"> |
| 111 | <view class="allradio flex-vertical-between"> | 111 | <view class="allradio flex-vertical-between"> |
| 112 | <view class="flex-vertical mlr" bindtap="checkAll"> | 112 | <view class="flex-vertical mlr" bindtap="checkAll"> |
| 113 | <!--<radio class="order-raido" color="red" checked="{{checkAllToggle}}"></radio>--> | 113 | <!--<radio class="order-raido" color="red" checked="{{checkAllToggle}}"></radio>--> |
pages/cart/cart/cart.wxss
| @@ -143,7 +143,7 @@ radio { | @@ -143,7 +143,7 @@ radio { | ||
| 143 | height: 100rpx; | 143 | height: 100rpx; |
| 144 | position: fixed; | 144 | position: fixed; |
| 145 | left: 0; | 145 | left: 0; |
| 146 | - bottom: 45px; | 146 | + bottom: 90rpx; |
| 147 | font-size: 28rpx; | 147 | font-size: 28rpx; |
| 148 | color: #666; | 148 | color: #666; |
| 149 | background-color: rgb(255, 255, 255); | 149 | background-color: rgb(255, 255, 255); |
pages/cart/cart2/cart2.js
| @@ -105,6 +105,8 @@ Page({ | @@ -105,6 +105,8 @@ Page({ | ||
| 105 | //-- order_prom_list -- | 105 | //-- order_prom_list -- |
| 106 | order_prom_list_cart:null, | 106 | order_prom_list_cart:null, |
| 107 | 107 | ||
| 108 | + ispt_goods:0, //是否平摊至单品，0要平摊 1不平摊 | ||
| 109 | + | ||
| 108 | }, | 110 | }, |
| 109 | onLoad: function(t) { | 111 | onLoad: function(t) { |
| 110 | 112 | ||
| @@ -122,7 +124,8 @@ Page({ | @@ -122,7 +124,8 @@ Page({ | ||
| 122 | //先获取是否有关闭使用优惠券 | 124 | //先获取是否有关闭使用优惠券 |
| 123 | getApp().getConfig2(function (ee) { | 125 | getApp().getConfig2(function (ee) { |
| 124 | var json_d = JSON.parse(ee.switch_list); | 126 | var json_d = JSON.parse(ee.switch_list); |
| 125 | - th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules }); | 127 | + th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 |
| 128 | + th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules}); | ||
| 126 | //-----先获取物流，再获取用户信息，再展示页面----- | 129 | //-----先获取物流，再获取用户信息，再展示页面----- |
| 127 | th.get_wuliu(th.get_info(th.show_page)); | 130 | th.get_wuliu(th.get_info(th.show_page)); |
| 128 | }) | 131 | }) |
| @@ -638,19 +641,17 @@ Page({ | @@ -638,19 +641,17 @@ Page({ | ||
| 638 | if(th.data.cartlist) c_arr[i].check_quan_ware_list= th.data.cartlist[i].check_quan_ware_list; //优惠券优惠什么商品 | 641 | if(th.data.cartlist) c_arr[i].check_quan_ware_list= th.data.cartlist[i].check_quan_ware_list; //优惠券优惠什么商品 |
| 639 | } | 642 | } |
| 640 | 643 | ||
| 641 | - var cart_item=c_arr[i]; | 644 | + var cart_item=c_arr[i]; //就是每一单的意思 |
| 642 | var pickid=cart_item.pickup_id; | 645 | var pickid=cart_item.pickup_id; |
| 643 | var o_price=0; | 646 | var o_price=0; |
| 644 | var o_shipping_price=0,goods_weight=-1, goods_piece=-1; | 647 | var o_shipping_price=0,goods_weight=-1, goods_piece=-1; |
| 645 | - var item=c_arr[i].goods; | ||
| 646 | - //--获取物流code-- | 648 | + var item=c_arr[i].goods; //就是每一单的从表的意思 |
| 647 | 649 | ||
| 648 | //--------循环计算总价----------- | 650 | //--------循环计算总价----------- |
| 649 | for(var j=0;j<item.length;j++){ | 651 | for(var j=0;j<item.length;j++){ |
| 650 | o_price += item[j].goods_price * item[j].goods_num; | 652 | o_price += item[j].goods_price * item[j].goods_num; |
| 651 | } | 653 | } |
| 652 | var f_o_price=o_price; | 654 | var f_o_price=o_price; |
| 653 | - var prom_g=th.data.prom_goods_map[pickid]; | ||
| 654 | 655 | ||
| 655 | //判断包邮券的钱 | 656 | //判断包邮券的钱 |
| 656 | var q_conditin=0; | 657 | var q_conditin=0; |
| @@ -674,7 +675,7 @@ Page({ | @@ -674,7 +675,7 @@ Page({ | ||
| 674 | item_map.is_bz = get_data.is_bz; //是不是倍增 | 675 | item_map.is_bz = get_data.is_bz; //是不是倍增 |
| 675 | item_map.bs = get_data.bs; //是不是倍数 | 676 | item_map.bs = get_data.bs; //是不是倍数 |
| 676 | item_map.is_past = get_data.is_past; //是不是包邮 | 677 | item_map.is_past = get_data.is_past; //是不是包邮 |
| 677 | - item_map.prom_price = get_data.price?get_data.price:item_map.price; | 678 | + item_map.prom_price = get_data.price>=0?get_data.price:item_map.price; |
| 678 | item_map.s_intValue = get_data.intValue; | 679 | item_map.s_intValue = get_data.intValue; |
| 679 | item_map.s_coupon_id = get_data.coupon_id; | 680 | item_map.s_coupon_id = get_data.coupon_id; |
| 680 | item_map.s_coupon_num = get_data.coupon_num; | 681 | item_map.s_coupon_num = get_data.coupon_num; |
| @@ -695,17 +696,10 @@ Page({ | @@ -695,17 +696,10 @@ Page({ | ||
| 695 | } | 696 | } |
| 696 | }) | 697 | }) |
| 697 | } | 698 | } |
| 698 | - //--------循环计算商品是不是包邮，是不是使用优惠券----------- | ||
| 699 | - for(var j=0;j<item.length;j++){ | ||
| 700 | - if(item[j].prom_type==3 && item[j].prom_id==item_map.prom_id){ | ||
| 701 | - item[j].is_xz_yh= item_map.is_xz_yh; | ||
| 702 | - item[j].is_past= item_map.is_past; | ||
| 703 | - } | ||
| 704 | - } | 699 | + |
| 705 | //有活动，且优惠活动并没有限制使用优惠券，且有减价 | 700 | //有活动，且优惠活动并没有限制使用优惠券，且有减价 |
| 706 | - //if(item_map && !item_map.is_xz_yh && item_map.price) q_conditin=o_price-item_map.price; | ||
| 707 | //--看有没有减价-- | 701 | //--看有没有减价-- |
| 708 | - if(item_map.prom_price && item_map.price-item_map.prom_price){ | 702 | + if(item_map.prom_price>=0 && item_map.price-item_map.prom_price){ |
| 709 | if(cart_item.prom_pt_json){ | 703 | if(cart_item.prom_pt_json){ |
| 710 | cart_item.prom_pt_json.push({"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0}) | 704 | cart_item.prom_pt_json.push({"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0}) |
| 711 | }else{ | 705 | }else{ |
| @@ -717,6 +711,18 @@ Page({ | @@ -717,6 +711,18 @@ Page({ | ||
| 717 | if(!item_map.is_xz_yh) q_conditin=o_price; | 711 | if(!item_map.is_xz_yh) q_conditin=o_price; |
| 718 | } | 712 | } |
| 719 | 713 | ||
| 714 | + | ||
| 715 | + //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表----------- | ||
| 716 | + for(var j=0;j<item.length;j++){ | ||
| 717 | + if(item[j].prom_type==3 && item[j].prom_id==item_map.prom_id){ | ||
| 718 | + item[j].is_xz_yh= item_map.is_xz_yh; | ||
| 719 | + item[j].is_past= item_map.is_past; | ||
| 720 | + item[j].account= th.item_map_get_goods(item[j].goods_id,item_map).account; | ||
| 721 | + item[j].account_yu= th.item_map_get_goods(item[j].goods_id,item_map).account_yu; | ||
| 722 | + } | ||
| 723 | + } | ||
| 724 | + | ||
| 725 | + | ||
| 720 | //--优惠多少钱-- | 726 | //--优惠多少钱-- |
| 721 | if(!cart_item.cut_price) cart_item.cut_price=0; | 727 | if(!cart_item.cut_price) cart_item.cut_price=0; |
| 722 | cart_item.cut_price+=(item_map.price-item_map.prom_price); | 728 | cart_item.cut_price+=(item_map.price-item_map.prom_price); |
| @@ -857,7 +863,6 @@ Page({ | @@ -857,7 +863,6 @@ Page({ | ||
| 857 | continue; | 863 | continue; |
| 858 | } | 864 | } |
| 859 | 865 | ||
| 860 | - | ||
| 861 | //----------------如果是选择了物流--------------------- | 866 | //----------------如果是选择了物流--------------------- |
| 862 | if(cart_item.exp_type == 0 && item[j].is_free_shipping==0){ | 867 | if(cart_item.exp_type == 0 && item[j].is_free_shipping==0){ |
| 863 | //如果地址不为空 | 868 | //如果地址不为空 |
| @@ -881,9 +886,9 @@ Page({ | @@ -881,9 +886,9 @@ Page({ | ||
| 881 | 886 | ||
| 882 | 887 | ||
| 883 | //计算物流价格 | 888 | //计算物流价格 |
| 884 | - if (c_arr[i].exp_type == 0) { | 889 | + if (cart_item.exp_type == 0) { |
| 885 | freight_free=0; //后面不在进行判断 | 890 | freight_free=0; //后面不在进行判断 |
| 886 | - var code = th.data.wu_arr[c_arr[i].wind].code; | 891 | + var code = th.data.wu_arr[cart_item.wind].code; |
| 887 | cart_item.shipping_price = | 892 | cart_item.shipping_price = |
| 888 | th.calculatewuliu(code, o_shipping_price, goods_weight, | 893 | th.calculatewuliu(code, o_shipping_price, goods_weight, |
| 889 | goods_piece,th.data.user_addr, freight_free, o_price, rs); | 894 | goods_piece,th.data.user_addr, freight_free, o_price, rs); |
| @@ -1476,6 +1481,7 @@ Page({ | @@ -1476,6 +1481,7 @@ Page({ | ||
| 1476 | goods.quan_num=th.data.formData.coupon_price; | 1481 | goods.quan_num=th.data.formData.coupon_price; |
| 1477 | goods.quan_no= item.coupon_no; | 1482 | goods.quan_no= item.coupon_no; |
| 1478 | } | 1483 | } |
| 1484 | + | ||
| 1479 | item.order_goods.push(goods); | 1485 | item.order_goods.push(goods); |
| 1480 | 1486 | ||
| 1481 | //--如果有赠品的时候，赠品也要提交--- | 1487 | //--如果有赠品的时候，赠品也要提交--- |
| @@ -1598,6 +1604,7 @@ Page({ | @@ -1598,6 +1604,7 @@ Page({ | ||
| 1598 | 'store_id': oo.stoid, | 1604 | 'store_id': oo.stoid, |
| 1599 | }; | 1605 | }; |
| 1600 | 1606 | ||
| 1607 | + | ||
| 1601 | //--把券的钱，写入从表--- | 1608 | //--把券的钱，写入从表--- |
| 1602 | if(t_item.quan_youhui_list && t_item.coupon_price ){ | 1609 | if(t_item.quan_youhui_list && t_item.coupon_price ){ |
| 1603 | for(var kk in t_item.quan_youhui_list ){ | 1610 | for(var kk in t_item.quan_youhui_list ){ |
| @@ -2617,7 +2624,7 @@ Page({ | @@ -2617,7 +2624,7 @@ Page({ | ||
| 2617 | arr.is_xz_yh=prom.is_xz_yh; //是不是优惠 | 2624 | arr.is_xz_yh=prom.is_xz_yh; //是不是优惠 |
| 2618 | arr.bs=get_data.bs; //是不是倍数 | 2625 | arr.bs=get_data.bs; //是不是倍数 |
| 2619 | arr.is_past=get_data.is_past; //是不是包邮 | 2626 | arr.is_past=get_data.is_past; //是不是包邮 |
| 2620 | - arr.prom_price=get_data.price?get_data.price:price; | 2627 | + arr.prom_price=get_data.price>=0?get_data.price:price; |
| 2621 | arr.s_intValue=get_data.intValue; | 2628 | arr.s_intValue=get_data.intValue; |
| 2622 | arr.s_coupon_id=get_data.coupon_id; | 2629 | arr.s_coupon_id=get_data.coupon_id; |
| 2623 | arr.s_coupon_num=get_data.coupon_num; | 2630 | arr.s_coupon_num=get_data.coupon_num; |
| @@ -2657,7 +2664,7 @@ Page({ | @@ -2657,7 +2664,7 @@ Page({ | ||
| 2657 | }) | 2664 | }) |
| 2658 | }, | 2665 | }, |
| 2659 | 2666 | ||
| 2660 | - //--- 加入优惠活动的映射中 --- | 2667 | + //--- 加入优惠活动的映射中，同时要有一个good列表 --- |
| 2661 | add_prom_goods_map:async function (item) { | 2668 | add_prom_goods_map:async function (item) { |
| 2662 | var th=this; | 2669 | var th=this; |
| 2663 | var pickid=item.pick_id; | 2670 | var pickid=item.pick_id; |
| @@ -2669,6 +2676,8 @@ Page({ | @@ -2669,6 +2676,8 @@ Page({ | ||
| 2669 | var ob=map[pickid][item.prom_id]; | 2676 | var ob=map[pickid][item.prom_id]; |
| 2670 | ob.price+=item.goods_price*item.goods_num; | 2677 | ob.price+=item.goods_price*item.goods_num; |
| 2671 | ob.goods_num+=item.goods_num; | 2678 | ob.goods_num+=item.goods_num; |
| 2679 | + ob.goods.push({goods_id:item.goods_id,goods_price:item.goods_price,goods_num:item.goods_num}); | ||
| 2680 | + | ||
| 2672 | }else{ | 2681 | }else{ |
| 2673 | var prom=null; | 2682 | var prom=null; |
| 2674 | await getApp().request.promiseGet("/api/weshop/promgoods/get/"+os.stoid+"/"+item.prom_id,{}).then(res=>{ | 2683 | await getApp().request.promiseGet("/api/weshop/promgoods/get/"+os.stoid+"/"+item.prom_id,{}).then(res=>{ |
| @@ -2680,6 +2689,8 @@ Page({ | @@ -2680,6 +2689,8 @@ Page({ | ||
| 2680 | ob.goods_num=item.goods_num; | 2689 | ob.goods_num=item.goods_num; |
| 2681 | ob.is_bz=prom.is_bz; | 2690 | ob.is_bz=prom.is_bz; |
| 2682 | ob.is_xz_yh=prom.is_xz_yh; | 2691 | ob.is_xz_yh=prom.is_xz_yh; |
| 2692 | + ob.goods=new Array(); | ||
| 2693 | + ob.goods.push({goods_id:item.goods_id,goods_price:item.goods_price,goods_num:item.goods_num}); | ||
| 2683 | map[pickid][item.prom_id]=ob; | 2694 | map[pickid][item.prom_id]=ob; |
| 2684 | } | 2695 | } |
| 2685 | }else{ | 2696 | }else{ |
| @@ -2693,6 +2704,9 @@ Page({ | @@ -2693,6 +2704,9 @@ Page({ | ||
| 2693 | ob.goods_num=item.goods_num; | 2704 | ob.goods_num=item.goods_num; |
| 2694 | ob.is_bz=prom.is_bz; | 2705 | ob.is_bz=prom.is_bz; |
| 2695 | ob.is_xz_yh=prom.is_xz_yh; | 2706 | ob.is_xz_yh=prom.is_xz_yh; |
| 2707 | + ob.goods=new Array(); | ||
| 2708 | + ob.goods.push({goods_id:item.goods_id,goods_price:item.goods_price,goods_num:item.goods_num}); | ||
| 2709 | + | ||
| 2696 | var obj={}; | 2710 | var obj={}; |
| 2697 | obj[item.prom_id]=ob; | 2711 | obj[item.prom_id]=ob; |
| 2698 | map[pickid]=obj; | 2712 | map[pickid]=obj; |
| @@ -2700,8 +2714,8 @@ Page({ | @@ -2700,8 +2714,8 @@ Page({ | ||
| 2700 | } | 2714 | } |
| 2701 | }, | 2715 | }, |
| 2702 | 2716 | ||
| 2703 | - //计算立即购买赠品的物流费用 | ||
| 2704 | - get_now_gift_goods_wuliu:function (code, o_shipping_price, user_addr, gift_freight_free,allpice, rs,shipping_price,no_by_data) { | 2717 | + //计算立即购买赠品的物流费用 |
| 2718 | + get_now_gift_goods_wuliu:function (code, o_shipping_price, user_addr, gift_freight_free,allpice, rs,shipping_price,no_by_data) { | ||
| 2705 | var good=this.data.buy_now_gift_goods; | 2719 | var good=this.data.buy_now_gift_goods; |
| 2706 | var goods_weight=-1, goods_piece=-1; | 2720 | var goods_weight=-1, goods_piece=-1; |
| 2707 | var gift_shipping_price=0; | 2721 | var gift_shipping_price=0; |
| @@ -2739,8 +2753,14 @@ Page({ | @@ -2739,8 +2753,14 @@ Page({ | ||
| 2739 | goods_piece, user_addr, gift_freight_free, allpice, rs); | 2753 | goods_piece, user_addr, gift_freight_free, allpice, rs); |
| 2740 | return t_shipping_price+shipping_price; | 2754 | return t_shipping_price+shipping_price; |
| 2741 | 2755 | ||
| 2742 | - } | 2756 | + }, |
| 2743 | 2757 | ||
| 2758 | + //从优惠的映射中拿出商品从表的item | ||
| 2759 | + item_map_get_goods:function(goods_id,map){ | ||
| 2760 | + for(var i in map.goods){ | ||
| 2761 | + if(map.goods[i].goods_id==goods_id) return map.goods[i]; | ||
| 2762 | + } | ||
| 2763 | + } | ||
| 2744 | 2764 | ||
| 2745 | 2765 | ||
| 2746 | }); | 2766 | }); |
pages/goods/goodsInfo/goodsInfo.js
| 1 | var t = require("../../../utils/util.js"), | 1 | var t = require("../../../utils/util.js"), |
| 2 | - ut = t, | ||
| 3 | - e = require("../../../utils/common.js"), | ||
| 4 | - a = require("../../../utils/wxParse/wxParse.js"), | ||
| 5 | - s = getApp(), | ||
| 6 | - i = s.request, | ||
| 7 | - rq = i, | ||
| 8 | - oo = s.globalData, | ||
| 9 | - o = s.globalData.setting, | ||
| 10 | - os = o; | 2 | + ut = t, |
| 3 | + e = require("../../../utils/common.js"), | ||
| 4 | + a = require("../../../utils/wxParse/wxParse.js"), | ||
| 5 | + s = getApp(), | ||
| 6 | + i = s.request, | ||
| 7 | + rq = i, | ||
| 8 | + oo = s.globalData, | ||
| 9 | + o = s.globalData.setting, | ||
| 10 | + os = o; | ||
| 11 | //评价加载更多 | 11 | //评价加载更多 |
| 12 | var more = function(e) { | 12 | var more = function(e) { |
| 13 | - return e && e.__esModule ? e : { | ||
| 14 | - default: e | ||
| 15 | - }; | ||
| 16 | - }(require("../../../utils/LoadMore.js")), | ||
| 17 | - n = new more.default(); | 13 | + return e && e.__esModule ? e : { |
| 14 | + default: e | ||
| 15 | + }; | ||
| 16 | + }(require("../../../utils/LoadMore.js")), | ||
| 17 | + n = new more.default(); | ||
| 18 | var utils = require('../../../utils/util.js'); | 18 | var utils = require('../../../utils/util.js'); |
| 19 | var regeneratorRuntime = require('../../../utils/runtime.js'); | 19 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
| 20 | 20 | ||
| @@ -76,10 +76,10 @@ Page({ | @@ -76,10 +76,10 @@ Page({ | ||
| 76 | }], | 76 | }], |
| 77 | activeCategoryId3: 1, | 77 | activeCategoryId3: 1, |
| 78 | categories3: [{ | 78 | categories3: [{ |
| 79 | - name: "全部", | ||
| 80 | - id: 1, | ||
| 81 | - num: 0 | ||
| 82 | - }, | 79 | + name: "全部", |
| 80 | + id: 1, | ||
| 81 | + num: 0 | ||
| 82 | + }, | ||
| 83 | { | 83 | { |
| 84 | name: "有图", | 84 | name: "有图", |
| 85 | id: 5, | 85 | id: 5, |
| @@ -125,8 +125,8 @@ Page({ | @@ -125,8 +125,8 @@ Page({ | ||
| 125 | pickpu_list: null, //读出的所有门店list | 125 | pickpu_list: null, //读出的所有门店list |
| 126 | def_pickpu_list: null, //一开始5个门店list | 126 | def_pickpu_list: null, //一开始5个门店list |
| 127 | sec_pick_index: 0, //第二级门店选择ID | 127 | sec_pick_index: 0, //第二级门店选择ID |
| 128 | - fir_pick_index: 0, //第一级门店选择ID | ||
| 129 | - all_pick_list:null,//所有的门店先记录起来 | 128 | + fir_pick_index: 0, //第一级门店选择ID |
| 129 | + all_pick_list:null,//所有的门店先记录起来 | ||
| 130 | //同一条形码的所有商品 | 130 | //同一条形码的所有商品 |
| 131 | sku_g: null, | 131 | sku_g: null, |
| 132 | sku_g_pt: null, //---拼单的普通购买--- | 132 | sku_g_pt: null, //---拼单的普通购买--- |
| @@ -219,7 +219,7 @@ Page({ | @@ -219,7 +219,7 @@ Page({ | ||
| 219 | new_user: 0, //新用户 | 219 | new_user: 0, //新用户 |
| 220 | 220 | ||
| 221 | def_pick_store: null, // 默认的门店 | 221 | def_pick_store: null, // 默认的门店 |
| 222 | - fir_def_store:null, //客户默认的门店的 | 222 | + fir_def_store:null, //客户默认的门店的 |
| 223 | lat: null, //维度 | 223 | lat: null, //维度 |
| 224 | lon: null, //经度 | 224 | lon: null, //经度 |
| 225 | 225 | ||
| @@ -232,14 +232,14 @@ Page({ | @@ -232,14 +232,14 @@ Page({ | ||
| 232 | comments_no_more:0, | 232 | comments_no_more:0, |
| 233 | get_c:0, //获取评价是不是成 | 233 | get_c:0, //获取评价是不是成 |
| 234 | is_collect_load:0, //是不是处理 | 234 | is_collect_load:0, //是不是处理 |
| 235 | - is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存 | ||
| 236 | - sales_rules:1, //默认是线上销售 | ||
| 237 | - | ||
| 238 | - wait_for_user_store:null, | ||
| 239 | - | ||
| 240 | - prom_goods:null, //商品优惠列表 | ||
| 241 | - order_prom:null, //订单优惠 | ||
| 242 | - collocationGoods:null, //搭配购 | 235 | + is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存 |
| 236 | + sales_rules:1, //默认是线上销售 | ||
| 237 | + | ||
| 238 | + wait_for_user_store:null, | ||
| 239 | + | ||
| 240 | + prom_goods:null, //商品优惠列表 | ||
| 241 | + order_prom:null, //订单优惠 | ||
| 242 | + collocationGoods:null, //搭配购 | ||
| 243 | 243 | ||
| 244 | }, | 244 | }, |
| 245 | 245 | ||
| @@ -249,11 +249,11 @@ Page({ | @@ -249,11 +249,11 @@ Page({ | ||
| 249 | title: "商品详情", | 249 | title: "商品详情", |
| 250 | }) | 250 | }) |
| 251 | var ee = this, | 251 | var ee = this, |
| 252 | - that = ee, | ||
| 253 | - th = ee, | ||
| 254 | - gid = t.goods_id, | ||
| 255 | - first_leader=t.first_leader, | ||
| 256 | - room_id=t.room_id; | 252 | + that = ee, |
| 253 | + th = ee, | ||
| 254 | + gid = t.goods_id, | ||
| 255 | + first_leader=t.first_leader, | ||
| 256 | + room_id=t.room_id; | ||
| 257 | 257 | ||
| 258 | //---获取手机地址坐标-- | 258 | //---获取手机地址坐标-- |
| 259 | //--如果tg_id是空的话，分享回来-- | 259 | //--如果tg_id是空的话，分享回来-- |
| @@ -267,18 +267,18 @@ Page({ | @@ -267,18 +267,18 @@ Page({ | ||
| 267 | } | 267 | } |
| 268 | ee.setData({ gid: gid}); | 268 | ee.setData({ gid: gid}); |
| 269 | if(first_leader){ | 269 | if(first_leader){ |
| 270 | - getApp().globalData.first_leader=first_leader; | ||
| 271 | - //调用接口判断是不是会员 | ||
| 272 | - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ | ||
| 273 | - if(res.data.code==0){ | ||
| 274 | - getApp().globalData.guide_id=res.data.data.id; | ||
| 275 | - } | ||
| 276 | - }) | 270 | + getApp().globalData.first_leader=first_leader; |
| 271 | + //调用接口判断是不是会员 | ||
| 272 | + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ | ||
| 273 | + if(res.data.code==0){ | ||
| 274 | + getApp().globalData.guide_id=res.data.data.id; | ||
| 275 | + } | ||
| 276 | + }) | ||
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | if(room_id){ | 279 | if(room_id){ |
| 280 | - getApp().globalData.room_id=room_id; | ||
| 281 | - getApp().globalData.room_goods_id=gid; | 280 | + getApp().globalData.room_id=room_id; |
| 281 | + getApp().globalData.room_goods_id=gid; | ||
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | 284 | ||
| @@ -291,7 +291,7 @@ Page({ | @@ -291,7 +291,7 @@ Page({ | ||
| 291 | getApp().getConfig2(function(e) { | 291 | getApp().getConfig2(function(e) { |
| 292 | ee.setData({ | 292 | ee.setData({ |
| 293 | bconfig: e, | 293 | bconfig: e, |
| 294 | - sales_rules:e.sales_rules | 294 | + sales_rules:e.sales_rules |
| 295 | }); | 295 | }); |
| 296 | 296 | ||
| 297 | if (e.categoryset.indexOf("," + 1 + ",") != -1) { | 297 | if (e.categoryset.indexOf("," + 1 + ",") != -1) { |
| @@ -313,9 +313,9 @@ Page({ | @@ -313,9 +313,9 @@ Page({ | ||
| 313 | var json_d = JSON.parse(e.switch_list); | 313 | var json_d = JSON.parse(e.switch_list); |
| 314 | ee.setData({ | 314 | ee.setData({ |
| 315 | store_config: e, | 315 | store_config: e, |
| 316 | - sys_switch:json_d, | 316 | + sys_switch:json_d, |
| 317 | is_closecoupon: json_d.is_closecoupon, | 317 | is_closecoupon: json_d.is_closecoupon, |
| 318 | - is_newsales_rules:json_d.is_newsales_rules | 318 | + is_newsales_rules:json_d.is_newsales_rules |
| 319 | }); | 319 | }); |
| 320 | ee.init(gid); | 320 | ee.init(gid); |
| 321 | //------几人评价------- | 321 | //------几人评价------- |
| @@ -325,39 +325,39 @@ Page({ | @@ -325,39 +325,39 @@ Page({ | ||
| 325 | supportPageScroll: !0 | 325 | supportPageScroll: !0 |
| 326 | }); | 326 | }); |
| 327 | 327 | ||
| 328 | - //计算等级价相关 | ||
| 329 | - var swithc_list=e.switch_list; | ||
| 330 | - var sw_arr=JSON.parse(swithc_list); | ||
| 331 | - //---如果后台又开等级卡的开关--- | ||
| 332 | - if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){ | ||
| 333 | - th.setData({rank_switch:true}); | ||
| 334 | - //---回调卡的列表--- | ||
| 335 | - th.getPlusCardType(function(ob){ | ||
| 336 | - th.setData({card_list:ob.card_list}); | ||
| 337 | - var ti = setInterval(function () { | ||
| 338 | - var user = getApp().globalData.userInfo; | ||
| 339 | - if (!user) return false; | ||
| 340 | - clearInterval(ti); | ||
| 341 | - | ||
| 342 | - if(user.card_field ){ | ||
| 343 | - var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 344 | - var end = new Date(str); | ||
| 345 | - end = Date.parse(end) / 1000; | ||
| 346 | - var now = ut.gettimestamp(); | ||
| 347 | - //--- 判断是等级会员，且在有效期范围内 --- | ||
| 348 | - if(user.card_field && now<end){ | ||
| 349 | - var card_name=ob.name_map.get(user.card_field); | ||
| 350 | - if(card_name.length>5) card_name=card_name.substring(0,5); | ||
| 351 | - | ||
| 352 | - var is_near_date=0; | ||
| 353 | - if(end-now<60*60*30*24) is_near_date=1; //如果小于30天 | ||
| 354 | - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date}); | ||
| 355 | - } | ||
| 356 | - } | ||
| 357 | - }, 500) | ||
| 358 | - }) | ||
| 359 | - | ||
| 360 | - } | 328 | + //计算等级价相关 |
| 329 | + var swithc_list=e.switch_list; | ||
| 330 | + var sw_arr=JSON.parse(swithc_list); | ||
| 331 | + //---如果后台又开等级卡的开关--- | ||
| 332 | + if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){ | ||
| 333 | + th.setData({rank_switch:true}); | ||
| 334 | + //---回调卡的列表--- | ||
| 335 | + th.getPlusCardType(function(ob){ | ||
| 336 | + th.setData({card_list:ob.card_list}); | ||
| 337 | + var ti = setInterval(function () { | ||
| 338 | + var user = getApp().globalData.userInfo; | ||
| 339 | + if (!user) return false; | ||
| 340 | + clearInterval(ti); | ||
| 341 | + | ||
| 342 | + if(user.card_field ){ | ||
| 343 | + var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 344 | + var end = new Date(str); | ||
| 345 | + end = Date.parse(end) / 1000; | ||
| 346 | + var now = ut.gettimestamp(); | ||
| 347 | + //--- 判断是等级会员，且在有效期范围内 --- | ||
| 348 | + if(user.card_field && now<end){ | ||
| 349 | + var card_name=ob.name_map.get(user.card_field); | ||
| 350 | + if(card_name.length>5) card_name=card_name.substring(0,5); | ||
| 351 | + | ||
| 352 | + var is_near_date=0; | ||
| 353 | + if(end-now<60*60*30*24) is_near_date=1; //如果小于30天 | ||
| 354 | + th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date}); | ||
| 355 | + } | ||
| 356 | + } | ||
| 357 | + }, 500) | ||
| 358 | + }) | ||
| 359 | + | ||
| 360 | + } | ||
| 361 | 361 | ||
| 362 | }); | 362 | }); |
| 363 | 363 | ||
| @@ -372,7 +372,7 @@ Page({ | @@ -372,7 +372,7 @@ Page({ | ||
| 372 | 372 | ||
| 373 | //获取用户的默认门店 | 373 | //获取用户的默认门店 |
| 374 | getApp().get_user_store(function(ee) { | 374 | getApp().get_user_store(function(ee) { |
| 375 | - | 375 | + |
| 376 | if(!ee) { | 376 | if(!ee) { |
| 377 | th.data.fir_def_store={}; //赋值空对象 | 377 | th.data.fir_def_store={}; //赋值空对象 |
| 378 | return false; | 378 | return false; |
| @@ -454,15 +454,15 @@ Page({ | @@ -454,15 +454,15 @@ Page({ | ||
| 454 | //------------程序初始化入口------------- | 454 | //------------程序初始化入口------------- |
| 455 | async init(gid) { | 455 | async init(gid) { |
| 456 | var ee = this, | 456 | var ee = this, |
| 457 | - th = ee, | ||
| 458 | - gallery = null, | ||
| 459 | - is_collect = 0, | ||
| 460 | - collect_id = 0, | ||
| 461 | - categories3 = ee.data.categories3, | ||
| 462 | - fir_com = null, | ||
| 463 | - fir_quan = null, | ||
| 464 | - mapurl = null, | ||
| 465 | - mapurl_f_img = null; | 457 | + th = ee, |
| 458 | + gallery = null, | ||
| 459 | + is_collect = 0, | ||
| 460 | + collect_id = 0, | ||
| 461 | + categories3 = ee.data.categories3, | ||
| 462 | + fir_com = null, | ||
| 463 | + fir_quan = null, | ||
| 464 | + mapurl = null, | ||
| 465 | + mapurl_f_img = null; | ||
| 466 | 466 | ||
| 467 | 467 | ||
| 468 | //------图片滚动---------- | 468 | //------图片滚动---------- |
| @@ -609,8 +609,8 @@ Page({ | @@ -609,8 +609,8 @@ Page({ | ||
| 609 | 609 | ||
| 610 | this.data.is_timer = 1; | 610 | this.data.is_timer = 1; |
| 611 | var ee = this, | 611 | var ee = this, |
| 612 | - gid = this.data.gid, | ||
| 613 | - i = getApp().request; | 612 | + gid = this.data.gid, |
| 613 | + i = getApp().request; | ||
| 614 | 614 | ||
| 615 | this.wait_for_store_config(); | 615 | this.wait_for_store_config(); |
| 616 | 616 | ||
| @@ -659,7 +659,7 @@ Page({ | @@ -659,7 +659,7 @@ Page({ | ||
| 659 | t.data.data['disc'] = txt; | 659 | t.data.data['disc'] = txt; |
| 660 | 660 | ||
| 661 | if (t.data.data.original_img.indexOf(o.imghost) == -1) | 661 | if (t.data.data.original_img.indexOf(o.imghost) == -1) |
| 662 | - t.data.data.original_img = o.imghost + t.data.data.original_img; | 662 | + t.data.data.original_img = o.imghost + t.data.data.original_img; |
| 663 | 663 | ||
| 664 | if (t.data.data.goods_content == null) t.data.data.goods_content = ""; | 664 | if (t.data.data.goods_content == null) t.data.data.goods_content = ""; |
| 665 | 665 | ||
| @@ -671,56 +671,56 @@ Page({ | @@ -671,56 +671,56 @@ Page({ | ||
| 671 | ee.setData({ | 671 | ee.setData({ |
| 672 | data: t.data.data, | 672 | data: t.data.data, |
| 673 | sele_g: t.data.data, | 673 | sele_g: t.data.data, |
| 674 | - userInfo:getApp().globalData.userInfo | 674 | + userInfo:getApp().globalData.userInfo |
| 675 | }); | 675 | }); |
| 676 | 676 | ||
| 677 | - | 677 | + |
| 678 | //获取统一条形码,普通商品和优惠促销的商品 | 678 | //获取统一条形码,普通商品和优惠促销的商品 |
| 679 | - if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 4 || ee.data.data.prom_type == 5){ | ||
| 680 | - //默认门店要拿下门店库存 | ||
| 681 | - if(that.data.sales_rules==2 && that.data.is_newsales_rules){ | ||
| 682 | - //获取门店 | ||
| 683 | - ee.get_sto(); | ||
| 684 | - //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存 | ||
| 685 | - getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){ | ||
| 686 | - if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){ | ||
| 687 | - var lock=0,plist=null; | ||
| 688 | - //先读取门店的lock,采用链式写法，少用await | ||
| 689 | - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 690 | - data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000} | ||
| 691 | - }).then(res=>{ | ||
| 692 | - if(res.data.code==0 && res.data.data.total>0){ | ||
| 693 | - for(var i in res.data.data.pageData) | ||
| 694 | - lock+=res.data.data.pageData[i].outQty | ||
| 695 | - } | ||
| 696 | - //---通过接口获取门店的线下库存信息-- | ||
| 697 | - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 698 | - data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} | ||
| 699 | - }) | ||
| 700 | - }).then(res=>{ | ||
| 701 | - if(res.data.code==0 && res.data.data.total>0){ | ||
| 702 | - plist=res.data.data.pageData[0]; | ||
| 703 | - } | ||
| 704 | - if(plist && plist.CanOutQty-lock>0){ | ||
| 705 | - that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock; | ||
| 706 | - }else{ | ||
| 707 | - that.data.fir_def_store.CanOutQty=0; | ||
| 708 | - } | ||
| 709 | - //--给门店赋值线下库存-- | ||
| 710 | - th.setData({def_pick_store:that.data.fir_def_store}); | 679 | + if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 4 || ee.data.data.prom_type == 5){ |
| 680 | + //默认门店要拿下门店库存 | ||
| 681 | + if(that.data.sales_rules==2 && that.data.is_newsales_rules){ | ||
| 682 | + //获取门店 | ||
| 683 | + ee.get_sto(); | ||
| 684 | + //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存 | ||
| 685 | + getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){ | ||
| 686 | + if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){ | ||
| 687 | + var lock=0,plist=null; | ||
| 688 | + //先读取门店的lock,采用链式写法，少用await | ||
| 689 | + getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 690 | + data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000} | ||
| 691 | + }).then(res=>{ | ||
| 692 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 693 | + for(var i in res.data.data.pageData) | ||
| 694 | + lock+=res.data.data.pageData[i].outQty | ||
| 695 | + } | ||
| 696 | + //---通过接口获取门店的线下库存信息-- | ||
| 697 | + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 698 | + data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} | ||
| 711 | }) | 699 | }) |
| 712 | - } | ||
| 713 | - }) | ||
| 714 | - }else{ | ||
| 715 | - //获取门店 | ||
| 716 | - ee.get_sto(); | ||
| 717 | - } | ||
| 718 | - | ||
| 719 | - ee.get_sku(o.stoid, t.data.data.sku, gid); | ||
| 720 | - } | 700 | + }).then(res=>{ |
| 701 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 702 | + plist=res.data.data.pageData[0]; | ||
| 703 | + } | ||
| 704 | + if(plist && plist.CanOutQty-lock>0){ | ||
| 705 | + that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock; | ||
| 706 | + }else{ | ||
| 707 | + that.data.fir_def_store.CanOutQty=0; | ||
| 708 | + } | ||
| 709 | + //--给门店赋值线下库存-- | ||
| 710 | + th.setData({def_pick_store:that.data.fir_def_store}); | ||
| 711 | + }) | ||
| 712 | + } | ||
| 713 | + }) | ||
| 714 | + }else{ | ||
| 715 | + //获取门店 | ||
| 716 | + ee.get_sto(); | ||
| 717 | + } | ||
| 718 | + | ||
| 719 | + ee.get_sku(o.stoid, t.data.data.sku, gid); | ||
| 720 | + } | ||
| 721 | else { | 721 | else { |
| 722 | var gg = "", | 722 | var gg = "", |
| 723 | - item = t.data.data; | 723 | + item = t.data.data; |
| 724 | 724 | ||
| 725 | if(item.goods_spec=="null" || item.goods_spec==null ) item.goods_spec=""; | 725 | if(item.goods_spec=="null" || item.goods_spec==null ) item.goods_spec=""; |
| 726 | if(item.goods_color=="null" || item.goods_color==null) item.goods_color=""; | 726 | if(item.goods_color=="null" || item.goods_color==null) item.goods_color=""; |
| @@ -837,7 +837,7 @@ Page({ | @@ -837,7 +837,7 @@ Page({ | ||
| 837 | //商品详情的时候调用 | 837 | //商品详情的时候调用 |
| 838 | tabGoodsContent: function() { | 838 | tabGoodsContent: function() { |
| 839 | var th = this, | 839 | var th = this, |
| 840 | - i = getApp().request; | 840 | + i = getApp().request; |
| 841 | this.setData({ | 841 | this.setData({ |
| 842 | activeCategoryId: 1 | 842 | activeCategoryId: 1 |
| 843 | }); | 843 | }); |
| @@ -882,8 +882,8 @@ Page({ | @@ -882,8 +882,8 @@ Page({ | ||
| 882 | //获取redis中的数量 | 882 | //获取redis中的数量 |
| 883 | async getactLen(func) { | 883 | async getactLen(func) { |
| 884 | var r_num = 0, | 884 | var r_num = 0, |
| 885 | - prom_type = this.data.prom_type, | ||
| 886 | - prom_id = this.data.prom_id; | 885 | + prom_type = this.data.prom_type, |
| 886 | + prom_id = this.data.prom_id; | ||
| 887 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { | 887 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { |
| 888 | 1: 1 | 888 | 1: 1 |
| 889 | }).then(res => { | 889 | }).then(res => { |
| @@ -924,10 +924,10 @@ Page({ | @@ -924,10 +924,10 @@ Page({ | ||
| 924 | return s.my_warnning("还未登录！", 0, this); | 924 | return s.my_warnning("还未登录！", 0, this); |
| 925 | } | 925 | } |
| 926 | var e = this, | 926 | var e = this, |
| 927 | - th = e, | ||
| 928 | - a = 0, | ||
| 929 | - o = this.data.sele_g; | ||
| 930 | - a = o.goods_id; | 927 | + th = e, |
| 928 | + a = 0, | ||
| 929 | + o = this.data.sele_g; | ||
| 930 | + a = o.goods_id; | ||
| 931 | 931 | ||
| 932 | //----------添加到购物车时，要判断限购数量，-------- | 932 | //----------添加到购物车时，要判断限购数量，-------- |
| 933 | e.get_buy_num(o, function(ee) { | 933 | e.get_buy_num(o, function(ee) { |
| @@ -1005,208 +1005,208 @@ Page({ | @@ -1005,208 +1005,208 @@ Page({ | ||
| 1005 | if (th.data.prom_type == 1) { | 1005 | if (th.data.prom_type == 1) { |
| 1006 | newd.goods_price = th.data.prom_price; | 1006 | newd.goods_price = th.data.prom_price; |
| 1007 | newd.member_goods_price = th.data.prom_price, | 1007 | newd.member_goods_price = th.data.prom_price, |
| 1008 | - newd.prom_type = th.data.prom_type; | 1008 | + newd.prom_type = th.data.prom_type; |
| 1009 | newd.prom_id = th.data.prom_id; | 1009 | newd.prom_id = th.data.prom_id; |
| 1010 | - | ||
| 1011 | - if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); | ||
| 1012 | - if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); | ||
| 1013 | - | ||
| 1014 | - th.add_cart_next(e,t,a,o,newd); //加入购物车下一步 | ||
| 1015 | - | 1010 | + |
| 1011 | + if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); | ||
| 1012 | + if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); | ||
| 1013 | + | ||
| 1014 | + th.add_cart_next(e,t,a,o,newd); //加入购物车下一步 | ||
| 1015 | + | ||
| 1016 | } | 1016 | } |
| 1017 | else if ( th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) { | 1017 | else if ( th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) { |
| 1018 | newd.prom_type = 0; | 1018 | newd.prom_type = 0; |
| 1019 | newd.prom_id = 0; | 1019 | newd.prom_id = 0; |
| 1020 | - | ||
| 1021 | - //---如果是线下门店销售的时候--- | ||
| 1022 | - if(th.data.sales_rules==2){ | ||
| 1023 | - var pick=th.get_pick_from_list(th.data.sto_sele_id) | ||
| 1024 | - //---通过接口获取门店的线下库存信息-- | ||
| 1025 | - getApp().request.get("/api/weshop/goods/getWareStorages",{ | ||
| 1026 | - data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}, | ||
| 1027 | - success:function(res){ | ||
| 1028 | - if(res.data.code==0){ | ||
| 1029 | - if(res.data.data.pageData.length>0){ | ||
| 1030 | - var CanOutQty=res.data.data.pageData[0].CanOutQty; | ||
| 1031 | - if(CanOutQty<e.data.goodsInputNum){ | ||
| 1032 | - return s.my_warnning("库存不足！", 0, th); | ||
| 1033 | - } | ||
| 1034 | - //在调一次接口,读取商品的预出库的数量，lock | ||
| 1035 | - getApp().request.get("/api/weshop/order/ware/lock/page",{ | ||
| 1036 | - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000}, | ||
| 1037 | - success:function(res_data){ | ||
| 1038 | - if(res_data.data.code==0 && res_data.data.data.total>0){ | ||
| 1039 | - | ||
| 1040 | - var lock=0; | ||
| 1041 | - for(var i in res_data.data.data.pageData){ | ||
| 1042 | - lock+=res_data.data.data.pageData[i].outQty; | ||
| 1043 | - } | ||
| 1044 | - | ||
| 1045 | - if(CanOutQty<=lock){ | ||
| 1046 | - return s.my_warnning("库存不足！", 0, th); | ||
| 1047 | - } | ||
| 1048 | - th.add_cart_next(e,t,a,o,newd,CanOutQty-lock); | ||
| 1049 | - }else{ | ||
| 1050 | - th.add_cart_next(e,t,a,o,newd,CanOutQty); | ||
| 1051 | - } | ||
| 1052 | - } | ||
| 1053 | - }) | ||
| 1054 | - }else{ | ||
| 1055 | - return s.my_warnning("库存不足！", 0, th); | ||
| 1056 | - } | ||
| 1057 | - | ||
| 1058 | - } | ||
| 1059 | - } | ||
| 1060 | - }) | ||
| 1061 | - }else{ | ||
| 1062 | - if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); | ||
| 1063 | - if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); | ||
| 1064 | - th.add_cart_next(e,t,a,o,newd); //加入购物车下一步 | ||
| 1065 | - } | ||
| 1066 | - } | 1020 | + |
| 1021 | + //---如果是线下门店销售的时候--- | ||
| 1022 | + if(th.data.sales_rules==2){ | ||
| 1023 | + var pick=th.get_pick_from_list(th.data.sto_sele_id) | ||
| 1024 | + //---通过接口获取门店的线下库存信息-- | ||
| 1025 | + getApp().request.get("/api/weshop/goods/getWareStorages",{ | ||
| 1026 | + data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}, | ||
| 1027 | + success:function(res){ | ||
| 1028 | + if(res.data.code==0){ | ||
| 1029 | + if(res.data.data.pageData.length>0){ | ||
| 1030 | + var CanOutQty=res.data.data.pageData[0].CanOutQty; | ||
| 1031 | + if(CanOutQty<e.data.goodsInputNum){ | ||
| 1032 | + return s.my_warnning("库存不足！", 0, th); | ||
| 1033 | + } | ||
| 1034 | + //在调一次接口,读取商品的预出库的数量，lock | ||
| 1035 | + getApp().request.get("/api/weshop/order/ware/lock/page",{ | ||
| 1036 | + data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000}, | ||
| 1037 | + success:function(res_data){ | ||
| 1038 | + if(res_data.data.code==0 && res_data.data.data.total>0){ | ||
| 1039 | + | ||
| 1040 | + var lock=0; | ||
| 1041 | + for(var i in res_data.data.data.pageData){ | ||
| 1042 | + lock+=res_data.data.data.pageData[i].outQty; | ||
| 1043 | + } | ||
| 1044 | + | ||
| 1045 | + if(CanOutQty<=lock){ | ||
| 1046 | + return s.my_warnning("库存不足！", 0, th); | ||
| 1047 | + } | ||
| 1048 | + th.add_cart_next(e,t,a,o,newd,CanOutQty-lock); | ||
| 1049 | + }else{ | ||
| 1050 | + th.add_cart_next(e,t,a,o,newd,CanOutQty); | ||
| 1051 | + } | ||
| 1052 | + } | ||
| 1053 | + }) | ||
| 1054 | + }else{ | ||
| 1055 | + return s.my_warnning("库存不足！", 0, th); | ||
| 1056 | + } | ||
| 1057 | + | ||
| 1058 | + } | ||
| 1059 | + } | ||
| 1060 | + }) | ||
| 1061 | + }else{ | ||
| 1062 | + if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); | ||
| 1063 | + if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); | ||
| 1064 | + th.add_cart_next(e,t,a,o,newd); //加入购物车下一步 | ||
| 1065 | + } | ||
| 1066 | + } | ||
| 1067 | }) | 1067 | }) |
| 1068 | }, | 1068 | }, |
| 1069 | - | 1069 | + |
| 1070 | //---加入购物车的最后一步--- | 1070 | //---加入购物车的最后一步--- |
| 1071 | add_cart_next(e,t,a,o,newd,CanOutQty){ | 1071 | add_cart_next(e,t,a,o,newd,CanOutQty){ |
| 1072 | - var th=this,i=getApp().request; | ||
| 1073 | - //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ | ||
| 1074 | - if(o.prom_type!=1 && o.prom_type!=6){ | ||
| 1075 | - var conf=th.data.bconfig; | 1072 | + var th=this,i=getApp().request; |
| 1073 | + //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ | ||
| 1074 | + if(o.prom_type!=1 && o.prom_type!=6){ | ||
| 1075 | + var conf=th.data.bconfig; | ||
| 1076 | if (conf.switch_list && getApp().globalData.userInfo['card_field']){ | 1076 | if (conf.switch_list && getApp().globalData.userInfo['card_field']){ |
| 1077 | - var s_list=JSON.parse(conf.switch_list); | ||
| 1078 | - var now=ut.gettimestamp(); | ||
| 1079 | - var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/'); | ||
| 1080 | - var end = new Date(str); | ||
| 1081 | - end = Date.parse(end) / 1000; | ||
| 1082 | - | ||
| 1083 | - //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下-- | ||
| 1084 | - if(parseInt(s_list.rank_switch)==2 && end>now){ | ||
| 1085 | - var card_price=o[getApp().globalData.userInfo['card_field']]; | ||
| 1086 | - //如果会员有等级价 | ||
| 1087 | - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null | ||
| 1088 | - && getApp().globalData.userInfo['card_field']!="" && card_price>0){ | ||
| 1089 | - newd.goods_price=card_price; | ||
| 1090 | - newd.member_goods_price=card_price; | ||
| 1091 | - } | ||
| 1092 | - } | ||
| 1093 | - } | ||
| 1094 | - } | ||
| 1095 | - | ||
| 1096 | - //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); | ||
| 1097 | - if ("add" == t.currentTarget.dataset.action) { | ||
| 1098 | - | ||
| 1099 | - if(th.data.prom_goods){ | ||
| 1100 | - newd.prom_type = 3; | ||
| 1101 | - newd.prom_id = th.data.prom_goods[0].prom_id; | 1077 | + var s_list=JSON.parse(conf.switch_list); |
| 1078 | + var now=ut.gettimestamp(); | ||
| 1079 | + var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/'); | ||
| 1080 | + var end = new Date(str); | ||
| 1081 | + end = Date.parse(end) / 1000; | ||
| 1082 | + | ||
| 1083 | + //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下-- | ||
| 1084 | + if(parseInt(s_list.rank_switch)==2 && end>now){ | ||
| 1085 | + var card_price=o[getApp().globalData.userInfo['card_field']]; | ||
| 1086 | + //如果会员有等级价 | ||
| 1087 | + if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null | ||
| 1088 | + && getApp().globalData.userInfo['card_field']!="" && card_price>0){ | ||
| 1089 | + newd.goods_price=card_price; | ||
| 1090 | + newd.member_goods_price=card_price; | ||
| 1091 | + } | ||
| 1102 | } | 1092 | } |
| 1093 | + } | ||
| 1094 | + } | ||
| 1103 | 1095 | ||
| 1104 | - //----先看会员在购物车中是否加入了该商品----- | ||
| 1105 | - i.get("/api/weshop/cart/page", { | ||
| 1106 | - data: { | ||
| 1107 | - store_id: e.data.stoid, | ||
| 1108 | - user_id: oo.user_id, | ||
| 1109 | - goods_id: a, | ||
| 1110 | - pick_id: e.data.sto_sele_id, | ||
| 1111 | - }, | ||
| 1112 | - success: function(re) { | ||
| 1113 | - | ||
| 1114 | - //-------如果购物车中有相关的数据--------- | ||
| 1115 | - if (re.data.data.total > 0) { | ||
| 1116 | - | ||
| 1117 | - var item = re.data.data.pageData[0]; | ||
| 1118 | - | ||
| 1119 | - //判断数量，要看下购物车中有没有该商品 | ||
| 1120 | - if(CanOutQty){ | ||
| 1121 | - if(item.goods_num+ th.data.goodsInputNum>CanOutQty){ | ||
| 1122 | - return s.my_warnning("库存不足！", 0, th); | ||
| 1123 | - } | ||
| 1124 | - }else{ | ||
| 1125 | - if(item.goods_num+ th.data.goodsInputNum>o.store_count){ | ||
| 1126 | - return s.my_warnning("库存不足！", 0, th); | ||
| 1127 | - } | ||
| 1128 | - } | ||
| 1129 | - | ||
| 1130 | - var updata = { | ||
| 1131 | - id: item.id, | ||
| 1132 | - goods_num: e.data.goodsInputNum + item.goods_num, | ||
| 1133 | - goods_price: newd.goods_price, | ||
| 1134 | - member_goods_price:newd.goods_price, | ||
| 1135 | - store_id: th.data.stoid, | ||
| 1136 | - }; | ||
| 1137 | - | ||
| 1138 | - //---是不是从收藏夹出来的--- | ||
| 1139 | - if(th.data.c_guide_id){ | ||
| 1140 | - updata['guide_id'] = th.data.c_guide_id; | ||
| 1141 | - updata['guide_type']=3; //加入购物车之后就变成了3 | ||
| 1142 | - }else { | ||
| 1143 | - if (getApp().globalData.guide_id) { | ||
| 1144 | - updata['guide_id'] = getApp().globalData.guide_id; | ||
| 1145 | - updata['guide_type'] = 0; | ||
| 1146 | - } | 1096 | + //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); |
| 1097 | + if ("add" == t.currentTarget.dataset.action) { | ||
| 1098 | + | ||
| 1099 | + if(th.data.prom_goods){ | ||
| 1100 | + newd.prom_type = 3; | ||
| 1101 | + newd.prom_id = th.data.prom_goods[0].prom_id; | ||
| 1102 | + } | ||
| 1103 | + | ||
| 1104 | + //----先看会员在购物车中是否加入了该商品----- | ||
| 1105 | + i.get("/api/weshop/cart/page", { | ||
| 1106 | + data: { | ||
| 1107 | + store_id: e.data.stoid, | ||
| 1108 | + user_id: oo.user_id, | ||
| 1109 | + goods_id: a, | ||
| 1110 | + pick_id: e.data.sto_sele_id, | ||
| 1111 | + }, | ||
| 1112 | + success: function(re) { | ||
| 1113 | + | ||
| 1114 | + //-------如果购物车中有相关的数据--------- | ||
| 1115 | + if (re.data.data.total > 0) { | ||
| 1116 | + | ||
| 1117 | + var item = re.data.data.pageData[0]; | ||
| 1118 | + | ||
| 1119 | + //判断数量，要看下购物车中有没有该商品 | ||
| 1120 | + if(CanOutQty){ | ||
| 1121 | + if(item.goods_num+ th.data.goodsInputNum>CanOutQty){ | ||
| 1122 | + return s.my_warnning("库存不足！", 0, th); | ||
| 1123 | + } | ||
| 1124 | + }else{ | ||
| 1125 | + if(item.goods_num+ th.data.goodsInputNum>o.store_count){ | ||
| 1126 | + return s.my_warnning("库存不足！", 0, th); | ||
| 1127 | + } | ||
| 1128 | + } | ||
| 1129 | + | ||
| 1130 | + var updata = { | ||
| 1131 | + id: item.id, | ||
| 1132 | + goods_num: e.data.goodsInputNum + item.goods_num, | ||
| 1133 | + goods_price: newd.goods_price, | ||
| 1134 | + member_goods_price:newd.goods_price, | ||
| 1135 | + store_id: th.data.stoid, | ||
| 1136 | + }; | ||
| 1137 | + | ||
| 1138 | + //---是不是从收藏夹出来的--- | ||
| 1139 | + if(th.data.c_guide_id){ | ||
| 1140 | + updata['guide_id'] = th.data.c_guide_id; | ||
| 1141 | + updata['guide_type']=3; //加入购物车之后就变成了3 | ||
| 1142 | + }else { | ||
| 1143 | + if (getApp().globalData.guide_id) { | ||
| 1144 | + updata['guide_id'] = getApp().globalData.guide_id; | ||
| 1145 | + updata['guide_type'] = 0; | ||
| 1146 | + } | ||
| 1147 | + } | ||
| 1148 | + | ||
| 1149 | + i.put("/api/weshop/cart/update", { | ||
| 1150 | + data: updata, | ||
| 1151 | + success: function(t) { | ||
| 1152 | + getApp().my_warnning('加入购物车成功', 1, th, 450); | ||
| 1153 | + var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; | ||
| 1154 | + th.setData({ | ||
| 1155 | + cartGoodsNum: c_num | ||
| 1156 | + }); | ||
| 1157 | + th.closeSpecModal(); | ||
| 1147 | } | 1158 | } |
| 1159 | + }); | ||
| 1160 | + } else { | ||
| 1161 | + | ||
| 1162 | + | ||
| 1163 | + i.post("/api/weshop/cart/save", { | ||
| 1164 | + data: newd, | ||
| 1165 | + success: function(t) { | ||
| 1166 | + getApp().my_warnning('加入购物车成功', 1, th, 450); | ||
| 1167 | + var c_num = th.data.cartGoodsNum + e.data.goodsInputNum; | ||
| 1168 | + th.setData({ | ||
| 1169 | + cartGoodsNum: c_num | ||
| 1170 | + }); | ||
| 1171 | + th.closeSpecModal(); | ||
| 1172 | + } | ||
| 1173 | + }); | ||
| 1174 | + } | ||
| 1175 | + } | ||
| 1176 | + }); | ||
| 1177 | + } | ||
| 1178 | + //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d); | ||
| 1179 | + else { | ||
| 1180 | + | ||
| 1181 | + if(th.data.prom_goods){ | ||
| 1182 | + var prom_d=th.data.prom_goods; | ||
| 1183 | + for(var i in prom_d){ | ||
| 1184 | + //判断活动有俩种条件，0元 1件 | ||
| 1185 | + var condition_t=prom_d[i].prom_type; | ||
| 1186 | + switch(condition_t) { | ||
| 1187 | + case 0: //按钱 | ||
| 1188 | + if(newd.goods_price>=condition_t){ | ||
| 1189 | + newd.prom_type = 3; | ||
| 1190 | + newd.prom_id = prom_d[i].prom_id; | ||
| 1191 | + } | ||
| 1192 | + break | ||
| 1193 | + case 1://按购买数量 | ||
| 1194 | + if(newd.goods_num>=condition_t){ | ||
| 1195 | + newd.prom_type = 3; | ||
| 1196 | + newd.prom_id = prom_d[i].prom_id; | ||
| 1197 | + } | ||
| 1198 | + break; | ||
| 1199 | + } | ||
| 1200 | + } | ||
| 1148 | 1201 | ||
| 1149 | - i.put("/api/weshop/cart/update", { | ||
| 1150 | - data: updata, | ||
| 1151 | - success: function(t) { | ||
| 1152 | - getApp().my_warnning('加入购物车成功', 1, th, 450); | ||
| 1153 | - var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; | ||
| 1154 | - th.setData({ | ||
| 1155 | - cartGoodsNum: c_num | ||
| 1156 | - }); | ||
| 1157 | - th.closeSpecModal(); | ||
| 1158 | - } | ||
| 1159 | - }); | ||
| 1160 | - } else { | ||
| 1161 | - | ||
| 1162 | - | ||
| 1163 | - i.post("/api/weshop/cart/save", { | ||
| 1164 | - data: newd, | ||
| 1165 | - success: function(t) { | ||
| 1166 | - getApp().my_warnning('加入购物车成功', 1, th, 450); | ||
| 1167 | - var c_num = th.data.cartGoodsNum + e.data.goodsInputNum; | ||
| 1168 | - th.setData({ | ||
| 1169 | - cartGoodsNum: c_num | ||
| 1170 | - }); | ||
| 1171 | - th.closeSpecModal(); | ||
| 1172 | - } | ||
| 1173 | - }); | ||
| 1174 | - } | ||
| 1175 | - } | ||
| 1176 | - }); | ||
| 1177 | - } | ||
| 1178 | - //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d); | ||
| 1179 | - else { | ||
| 1180 | - | ||
| 1181 | - if(th.data.prom_goods){ | ||
| 1182 | - var prom_d=th.data.prom_goods; | ||
| 1183 | - for(var i in prom_d){ | ||
| 1184 | - //判断活动有俩种条件，0元 1件 | ||
| 1185 | - var condition_t=prom_d[i].prom_type; | ||
| 1186 | - switch(condition_t) { | ||
| 1187 | - case 0: //按钱 | ||
| 1188 | - if(newd.goods_price>=condition_t){ | ||
| 1189 | - newd.prom_type = 3; | ||
| 1190 | - newd.prom_id = prom_d[i].prom_id; | ||
| 1191 | - } | ||
| 1192 | - break | ||
| 1193 | - case 1://按购买数量 | ||
| 1194 | - if(newd.goods_num>=condition_t){ | ||
| 1195 | - newd.prom_type = 3; | ||
| 1196 | - newd.prom_id = prom_d[i].prom_id; | ||
| 1197 | - } | ||
| 1198 | - break; | ||
| 1199 | - } | ||
| 1200 | - } | ||
| 1201 | - | ||
| 1202 | - } | ||
| 1203 | - | ||
| 1204 | - newd['pick_name'] = th.data.sto_sele_name; | ||
| 1205 | - newd['pick_dis'] = th.data.sto_sele_distr; | ||
| 1206 | - th.buyNow(newd); | ||
| 1207 | - } | 1202 | + } |
| 1203 | + | ||
| 1204 | + newd['pick_name'] = th.data.sto_sele_name; | ||
| 1205 | + newd['pick_dis'] = th.data.sto_sele_distr; | ||
| 1206 | + th.buyNow(newd); | ||
| 1207 | + } | ||
| 1208 | }, | 1208 | }, |
| 1209 | - | 1209 | + |
| 1210 | 1210 | ||
| 1211 | //----------购买虚拟商品------ | 1211 | //----------购买虚拟商品------ |
| 1212 | buyVirtualGoods: function(e) { | 1212 | buyVirtualGoods: function(e) { |
| @@ -1256,17 +1256,17 @@ Page({ | @@ -1256,17 +1256,17 @@ Page({ | ||
| 1256 | 1256 | ||
| 1257 | //--判断商品是否超出限购-- | 1257 | //--判断商品是否超出限购-- |
| 1258 | if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { | 1258 | if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { |
| 1259 | - | ||
| 1260 | - var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id); | ||
| 1261 | - | 1259 | + |
| 1260 | + var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id); | ||
| 1261 | + | ||
| 1262 | if (t + gd_buy_num > th.data.sele_g.viplimited) { | 1262 | if (t + gd_buy_num > th.data.sele_g.viplimited) { |
| 1263 | wx.showModal({ | 1263 | wx.showModal({ |
| 1264 | title: '超出商品限购', | 1264 | title: '超出商品限购', |
| 1265 | }); | 1265 | }); |
| 1266 | - | ||
| 1267 | - var num= th.data.sele_g.viplimited-gd_buy_num; | ||
| 1268 | - if(num<0) num=0; | ||
| 1269 | - th.setData({goodsInputNum:num}) | 1266 | + |
| 1267 | + var num= th.data.sele_g.viplimited-gd_buy_num; | ||
| 1268 | + if(num<0) num=0; | ||
| 1269 | + th.setData({goodsInputNum:num}) | ||
| 1270 | return false; | 1270 | return false; |
| 1271 | } | 1271 | } |
| 1272 | } | 1272 | } |
| @@ -1277,10 +1277,10 @@ Page({ | @@ -1277,10 +1277,10 @@ Page({ | ||
| 1277 | wx.showModal({ | 1277 | wx.showModal({ |
| 1278 | title: '超出商品活动限购', | 1278 | title: '超出商品活动限购', |
| 1279 | }); | 1279 | }); |
| 1280 | - | ||
| 1281 | - var num=th.data.prom_buy_limit- th.data.prom_buy_num ; | ||
| 1282 | - if(num<0) num=0; | ||
| 1283 | - th.setData({goodsInputNum:num}) | 1280 | + |
| 1281 | + var num=th.data.prom_buy_limit- th.data.prom_buy_num ; | ||
| 1282 | + if(num<0) num=0; | ||
| 1283 | + th.setData({goodsInputNum:num}) | ||
| 1284 | return false; | 1284 | return false; |
| 1285 | } | 1285 | } |
| 1286 | } | 1286 | } |
| @@ -1289,40 +1289,40 @@ Page({ | @@ -1289,40 +1289,40 @@ Page({ | ||
| 1289 | var redis_num = 0; | 1289 | var redis_num = 0; |
| 1290 | //------判断活动是否抢光----- | 1290 | //------判断活动是否抢光----- |
| 1291 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + | 1291 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + |
| 1292 | - os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, { | ||
| 1293 | - 1: 1 | ||
| 1294 | - }).then(res => { | 1292 | + os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, { |
| 1293 | + 1: 1 | ||
| 1294 | + }).then(res => { | ||
| 1295 | redis_num = res.data.data; | 1295 | redis_num = res.data.data; |
| 1296 | }); | 1296 | }); |
| 1297 | 1297 | ||
| 1298 | if (t > redis_num) { | 1298 | if (t > redis_num) { |
| 1299 | wx.showModal({ | 1299 | wx.showModal({ |
| 1300 | title: '超出商品活动库存', | 1300 | title: '超出商品活动库存', |
| 1301 | - }); | ||
| 1302 | - th.setData({goodsInputNum:redis_num}) | 1301 | + }); |
| 1302 | + th.setData({goodsInputNum:redis_num}) | ||
| 1303 | + return false; | ||
| 1304 | + } | ||
| 1305 | + | ||
| 1306 | + } | ||
| 1307 | + | ||
| 1308 | + var e = th.data.sele_g.store_count; | ||
| 1309 | + if(th.data.sales_rules==2){ | ||
| 1310 | + if(!th.data.def_pick_store){ | ||
| 1311 | + wx.showModal({ title: '请选择门店', }); | ||
| 1303 | return false; | 1312 | return false; |
| 1313 | + }else{ | ||
| 1314 | + e=th.data.def_pick_store.CanOutQty; | ||
| 1304 | } | 1315 | } |
| 1316 | + } | ||
| 1305 | 1317 | ||
| 1318 | + //库存不足，不增加 | ||
| 1319 | + if(e<t){ wx.showModal({ title: '库存不足', }); | ||
| 1320 | + if(e<0) e=0; | ||
| 1321 | + th.setData({ goodsInputNum: e }); return false; | ||
| 1306 | } | 1322 | } |
| 1323 | + t > e || 0 == e ? t = e : t < 1 && (t = 1); | ||
| 1324 | + th.setData({ goodsInputNum: t }); | ||
| 1307 | 1325 | ||
| 1308 | - var e = th.data.sele_g.store_count; | ||
| 1309 | - if(th.data.sales_rules==2){ | ||
| 1310 | - if(!th.data.def_pick_store){ | ||
| 1311 | - wx.showModal({ title: '请选择门店', }); | ||
| 1312 | - return false; | ||
| 1313 | - }else{ | ||
| 1314 | - e=th.data.def_pick_store.CanOutQty; | ||
| 1315 | - } | ||
| 1316 | - } | ||
| 1317 | - | ||
| 1318 | - //库存不足，不增加 | ||
| 1319 | - if(e<t){ wx.showModal({ title: '库存不足', }); | ||
| 1320 | - if(e<0) e=0; | ||
| 1321 | - th.setData({ goodsInputNum: e }); return false; | ||
| 1322 | - } | ||
| 1323 | - t > e || 0 == e ? t = e : t < 1 && (t = 1); | ||
| 1324 | - th.setData({ goodsInputNum: t }); | ||
| 1325 | - | ||
| 1326 | }) | 1326 | }) |
| 1327 | }, | 1327 | }, |
| 1328 | 1328 | ||
| @@ -1359,7 +1359,7 @@ Page({ | @@ -1359,7 +1359,7 @@ Page({ | ||
| 1359 | //---------点击收藏和不收藏------------ | 1359 | //---------点击收藏和不收藏------------ |
| 1360 | collectGoods: function() { | 1360 | collectGoods: function() { |
| 1361 | var t = this, | 1361 | var t = this, |
| 1362 | - i = getApp().request; | 1362 | + i = getApp().request; |
| 1363 | var user_id = s.globalData.user_id; | 1363 | var user_id = s.globalData.user_id; |
| 1364 | if (user_id == '') { | 1364 | if (user_id == '') { |
| 1365 | getApp().getUserFir(function() {}); | 1365 | getApp().getUserFir(function() {}); |
| @@ -1483,7 +1483,7 @@ Page({ | @@ -1483,7 +1483,7 @@ Page({ | ||
| 1483 | 1483 | ||
| 1484 | previewGoodsCommentImgs: function(t) { | 1484 | previewGoodsCommentImgs: function(t) { |
| 1485 | var e = this, | 1485 | var e = this, |
| 1486 | - a = this.data.data.comment[t.currentTarget.dataset.cidx].img; | 1486 | + a = this.data.data.comment[t.currentTarget.dataset.cidx].img; |
| 1487 | a = a.map(function(t) { | 1487 | a = a.map(function(t) { |
| 1488 | return e.data.url + t; | 1488 | return e.data.url + t; |
| 1489 | }), wx.previewImage({ | 1489 | }), wx.previewImage({ |
| @@ -1518,7 +1518,7 @@ Page({ | @@ -1518,7 +1518,7 @@ Page({ | ||
| 1518 | } | 1518 | } |
| 1519 | var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; | 1519 | var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; |
| 1520 | if(getApp().globalData.user_id){ | 1520 | if(getApp().globalData.user_id){ |
| 1521 | - url+="&first_leader="+getApp().globalData.user_id; | 1521 | + url+="&first_leader="+getApp().globalData.user_id; |
| 1522 | } | 1522 | } |
| 1523 | 1523 | ||
| 1524 | return { | 1524 | return { |
| @@ -1549,6 +1549,8 @@ Page({ | @@ -1549,6 +1549,8 @@ Page({ | ||
| 1549 | //----------装载同一条形码的商品---------- | 1549 | //----------装载同一条形码的商品---------- |
| 1550 | async get_sku(stoid, sku, g_id, is_normal, func) { | 1550 | async get_sku(stoid, sku, g_id, is_normal, func) { |
| 1551 | var tt = this,arrdata=null; | 1551 | var tt = this,arrdata=null; |
| 1552 | + var now=ut.gettimestamp(); | ||
| 1553 | + | ||
| 1552 | await getApp().request.promiseGet("/api/weshop/goods/page", { | 1554 | await getApp().request.promiseGet("/api/weshop/goods/page", { |
| 1553 | data: { | 1555 | data: { |
| 1554 | store_id: o.stoid, | 1556 | store_id: o.stoid, |
| @@ -1557,82 +1559,82 @@ Page({ | @@ -1557,82 +1559,82 @@ Page({ | ||
| 1557 | is_on_sale: 1 | 1559 | is_on_sale: 1 |
| 1558 | } | 1560 | } |
| 1559 | }).then(res => { | 1561 | }).then(res => { |
| 1560 | - var e = res; | ||
| 1561 | - if (e.data.code == 0) arrdata = e.data.data.pageData; | 1562 | + var e = res; |
| 1563 | + if (e.data.code == 0) arrdata = e.data.data.pageData; | ||
| 1562 | }) | 1564 | }) |
| 1563 | - if(!arrdata) return fasle; | ||
| 1564 | - | ||
| 1565 | - var arrsku = new Array(); | 1565 | + if(!arrdata) return fasle; |
| 1566 | + | ||
| 1567 | + var arrsku = new Array(); | ||
| 1566 | var gitem = null; | 1568 | var gitem = null; |
| 1567 | - var gb = 1,gg = ""; | ||
| 1568 | - for (var i = 0; i < arrdata.length; i++) { | ||
| 1569 | - var goodsinfo=arrdata[i],prom=null; | ||
| 1570 | - if (goodsinfo.goods_id != g_id) { | ||
| 1571 | - if(goodsinfo.prom_type==1){ | ||
| 1572 | - await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1573 | - }).then(res=>{ | ||
| 1574 | - if(res.data.code==0) prom=res.data.data; | ||
| 1575 | - }) | ||
| 1576 | - } | ||
| 1577 | - if(goodsinfo.prom_type==6){ | ||
| 1578 | - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1579 | - }).then(res=>{ | ||
| 1580 | - if(res.data.code==0) prom=res.data.data; | ||
| 1581 | - }) | ||
| 1582 | - } | ||
| 1583 | - } | ||
| 1584 | - //---如果有活动，不算在一起--- | ||
| 1585 | - if(prom){ | ||
| 1586 | - if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){ | ||
| 1587 | - continue; | ||
| 1588 | - } | ||
| 1589 | - } | ||
| 1590 | - | ||
| 1591 | - var item = arrdata[i],gg = ""; | ||
| 1592 | - if(item.goods_spec=="null" || item.goods_spec==null) item.goods_spec=""; | ||
| 1593 | - if(item.goods_color=="null" || item.goods_color==null) item.goods_color=""; | ||
| 1594 | - | ||
| 1595 | - if (item.goods_spec != "" && item.goods_color != "") { | ||
| 1596 | - gg = item.goods_spec + "/" + item.goods_color; | ||
| 1597 | - } else if (item.goods_spec != "" || item.goods_color != "") { | ||
| 1598 | - gg = item.goods_spec + item.goods_color; | ||
| 1599 | - } else { | ||
| 1600 | - gg = "规格" + gb; | ||
| 1601 | - gb++; | ||
| 1602 | - } | ||
| 1603 | - item.gg = gg; | 1569 | + var gb = 1,gg = ""; |
| 1570 | + for (var i = 0; i < arrdata.length; i++) { | ||
| 1571 | + var goodsinfo=arrdata[i],prom=null; | ||
| 1572 | + if (goodsinfo.goods_id != g_id) { | ||
| 1573 | + if(goodsinfo.prom_type==1){ | ||
| 1574 | + await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1575 | + }).then(res=>{ | ||
| 1576 | + if(res.data.code==0) prom=res.data.data; | ||
| 1577 | + }) | ||
| 1578 | + } | ||
| 1579 | + if(goodsinfo.prom_type==6){ | ||
| 1580 | + await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1581 | + }).then(res=>{ | ||
| 1582 | + if(res.data.code==0) prom=res.data.data; | ||
| 1583 | + }) | ||
| 1584 | + } | ||
| 1585 | + } | ||
| 1586 | + //---如果有活动，不算在一起--- | ||
| 1587 | + if(prom){ | ||
| 1588 | + if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){ | ||
| 1589 | + continue; | ||
| 1590 | + } | ||
| 1591 | + } | ||
| 1604 | 1592 | ||
| 1605 | - if(item.spec_img) | ||
| 1606 | - item.original_img=os.imghost+item.spec_img; | ||
| 1607 | - else | ||
| 1608 | - item.original_img=os.imghost+item.original_img; | 1593 | + var item = arrdata[i],gg = ""; |
| 1594 | + if(item.goods_spec=="null" || item.goods_spec==null) item.goods_spec=""; | ||
| 1595 | + if(item.goods_color=="null" || item.goods_color==null) item.goods_color=""; | ||
| 1609 | 1596 | ||
| 1610 | - | ||
| 1611 | - if (item.goods_id == g_id) { | ||
| 1612 | - gitem = item; | ||
| 1613 | - } else { | ||
| 1614 | - arrsku.push(item); | ||
| 1615 | - } | ||
| 1616 | - } | ||
| 1617 | - //-----------排列在最前面------------- | ||
| 1618 | - arrsku.splice(0, 0, gitem); | ||
| 1619 | - if (is_normal == 1) { | ||
| 1620 | - tt.setData({ | ||
| 1621 | - sku_g_pt: arrsku, | ||
| 1622 | - sele_g: gitem | ||
| 1623 | - }); | ||
| 1624 | - func(); | ||
| 1625 | - } else { | ||
| 1626 | - tt.setData({ | ||
| 1627 | - sku_g: arrsku, | ||
| 1628 | - sele_g: gitem | ||
| 1629 | - }); | ||
| 1630 | - } | 1597 | + if (item.goods_spec != "" && item.goods_color != "") { |
| 1598 | + gg = item.goods_spec + "/" + item.goods_color; | ||
| 1599 | + } else if (item.goods_spec != "" || item.goods_color != "") { | ||
| 1600 | + gg = item.goods_spec + item.goods_color; | ||
| 1601 | + } else { | ||
| 1602 | + gg = "规格" + gb; | ||
| 1603 | + gb++; | ||
| 1604 | + } | ||
| 1605 | + item.gg = gg; | ||
| 1606 | + | ||
| 1607 | + if(item.spec_img) | ||
| 1608 | + item.original_img=os.imghost+item.spec_img; | ||
| 1609 | + else | ||
| 1610 | + item.original_img=os.imghost+item.original_img; | ||
| 1611 | + | ||
| 1612 | + | ||
| 1613 | + if (item.goods_id == g_id) { | ||
| 1614 | + gitem = item; | ||
| 1615 | + } else { | ||
| 1616 | + arrsku.push(item); | ||
| 1617 | + } | ||
| 1618 | + } | ||
| 1619 | + //-----------排列在最前面------------- | ||
| 1620 | + arrsku.splice(0, 0, gitem); | ||
| 1621 | + if (is_normal == 1) { | ||
| 1622 | + tt.setData({ | ||
| 1623 | + sku_g_pt: arrsku, | ||
| 1624 | + sele_g: gitem | ||
| 1625 | + }); | ||
| 1626 | + func(); | ||
| 1627 | + } else { | ||
| 1628 | + tt.setData({ | ||
| 1629 | + sku_g: arrsku, | ||
| 1630 | + sele_g: gitem | ||
| 1631 | + }); | ||
| 1632 | + } | ||
| 1631 | }, | 1633 | }, |
| 1632 | 1634 | ||
| 1633 | //-----------选择属性的按钮事件---------- | 1635 | //-----------选择属性的按钮事件---------- |
| 1634 | sele_spec: function(e) { | 1636 | sele_spec: function(e) { |
| 1635 | - var that=this,ee=this,th=this; | 1637 | + var that=this,ee=this,th=this; |
| 1636 | var gid = e.currentTarget.dataset.gid; | 1638 | var gid = e.currentTarget.dataset.gid; |
| 1637 | var sku_g = this.data.sku_g; | 1639 | var sku_g = this.data.sku_g; |
| 1638 | var item = null; | 1640 | var item = null; |
| @@ -1650,95 +1652,95 @@ Page({ | @@ -1650,95 +1652,95 @@ Page({ | ||
| 1650 | that.check_is_youhui(gid) | 1652 | that.check_is_youhui(gid) |
| 1651 | 1653 | ||
| 1652 | 1654 | ||
| 1653 | - this.get_sto(); | ||
| 1654 | - //默认门店要拿下门店库存 | ||
| 1655 | - if(that.data.sales_rules==2 && that.data.def_pick_store){ | ||
| 1656 | - var lock=0,plist=null; | ||
| 1657 | - //先读取门店的lock,采用链式写法，少用await | ||
| 1658 | - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 1659 | - data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000} | ||
| 1660 | - }).then(res=>{ | ||
| 1661 | - if(res.data.code==0 && res.data.data.total>0){ | ||
| 1662 | - for(var i in res.data.data.pageData) | ||
| 1663 | - lock+=res.data.data.pageData[i].outQty | ||
| 1664 | - } | ||
| 1665 | - //---通过接口获取门店的线下库存信息-- | ||
| 1666 | - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 1667 | - data:{storageNos:that.data.def_pick_store.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid} | ||
| 1668 | - }) | ||
| 1669 | - }).then(res=>{ | ||
| 1670 | - if(res.data.code==0 && res.data.data.total>0){ | ||
| 1671 | - plist=res.data.data.pageData[0]; | ||
| 1672 | - } | ||
| 1673 | - if(plist && plist.CanOutQty-lock>0){ | ||
| 1674 | - that.data.def_pick_store.CanOutQty=plist.CanOutQty-lock; | ||
| 1675 | - }else{ | ||
| 1676 | - that.data.def_pick_store.CanOutQty=0; | ||
| 1677 | - } | ||
| 1678 | - //--给门店赋值线下库存-- | ||
| 1679 | - th.setData({def_pick_store:that.data.def_pick_store}); | ||
| 1680 | - }) | ||
| 1681 | - } | ||
| 1682 | - | ||
| 1683 | - | ||
| 1684 | - this.sele_spec_chech_activity(); | 1655 | + this.get_sto(); |
| 1656 | + //默认门店要拿下门店库存 | ||
| 1657 | + if(that.data.sales_rules==2 && that.data.def_pick_store){ | ||
| 1658 | + var lock=0,plist=null; | ||
| 1659 | + //先读取门店的lock,采用链式写法，少用await | ||
| 1660 | + getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 1661 | + data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000} | ||
| 1662 | + }).then(res=>{ | ||
| 1663 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 1664 | + for(var i in res.data.data.pageData) | ||
| 1665 | + lock+=res.data.data.pageData[i].outQty | ||
| 1666 | + } | ||
| 1667 | + //---通过接口获取门店的线下库存信息-- | ||
| 1668 | + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 1669 | + data:{storageNos:that.data.def_pick_store.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid} | ||
| 1670 | + }) | ||
| 1671 | + }).then(res=>{ | ||
| 1672 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 1673 | + plist=res.data.data.pageData[0]; | ||
| 1674 | + } | ||
| 1675 | + if(plist && plist.CanOutQty-lock>0){ | ||
| 1676 | + that.data.def_pick_store.CanOutQty=plist.CanOutQty-lock; | ||
| 1677 | + }else{ | ||
| 1678 | + that.data.def_pick_store.CanOutQty=0; | ||
| 1679 | + } | ||
| 1680 | + //--给门店赋值线下库存-- | ||
| 1681 | + th.setData({def_pick_store:that.data.def_pick_store}); | ||
| 1682 | + }) | ||
| 1683 | + } | ||
| 1684 | + | ||
| 1685 | + | ||
| 1686 | + this.sele_spec_chech_activity(); | ||
| 1685 | }, | 1687 | }, |
| 1686 | - | 1688 | + |
| 1687 | //选择了不同的规格的时候要判断是不是有活动正在进行中 | 1689 | //选择了不同的规格的时候要判断是不是有活动正在进行中 |
| 1688 | async sele_spec_chech_activity(){ | 1690 | async sele_spec_chech_activity(){ |
| 1689 | - //---如果是活动的时候--- | ||
| 1690 | - var prom=null,goodsinfo=this.data.sele_g,th=this; | ||
| 1691 | - if(goodsinfo.prom_type==1){ | ||
| 1692 | - await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1693 | - }).then(res=>{ | ||
| 1694 | - if(res.data.code==0){ | ||
| 1695 | - prom=res.data.data; | ||
| 1696 | - } | ||
| 1697 | - }) | ||
| 1698 | - } | ||
| 1699 | - if(goodsinfo.prom_type==6){ | ||
| 1700 | - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1701 | - }).then(res=>{ | ||
| 1702 | - if(res.data.code==0){ | ||
| 1703 | - prom=res.data.data; | ||
| 1704 | - } | ||
| 1705 | - }) | ||
| 1706 | - } | ||
| 1707 | - //----------如果有活动，并且在进行中，就不计算线下库存--------------- | ||
| 1708 | - var now=ut.gettimestamp(); | ||
| 1709 | - if(prom){ | ||
| 1710 | - if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){ | ||
| 1711 | - th.setData({ | ||
| 1712 | - prom_type:goodsinfo.prom_type, | ||
| 1713 | - prom_price:prom.price, | ||
| 1714 | - prom_buy_limit:prom.buy_limit, | ||
| 1715 | - prom_end_time:prom.end_time, | ||
| 1716 | - prom_start_time:prom.start_time, | ||
| 1717 | - prom_st:1, | ||
| 1718 | - }) | ||
| 1719 | - return false; | ||
| 1720 | - } | ||
| 1721 | - } | ||
| 1722 | - //---设置普通商品--- | ||
| 1723 | - th.setData({ | ||
| 1724 | - prom_type:0, | ||
| 1725 | - prom_price:null, | ||
| 1726 | - prom_buy_limit:null, | ||
| 1727 | - prom_end_time:null, | ||
| 1728 | - prom_start_time:null, | ||
| 1729 | - prom_st:null, | ||
| 1730 | - }) | ||
| 1731 | - | 1691 | + //---如果是活动的时候--- |
| 1692 | + var prom=null,goodsinfo=this.data.sele_g,th=this; | ||
| 1693 | + if(goodsinfo.prom_type==1){ | ||
| 1694 | + await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1695 | + }).then(res=>{ | ||
| 1696 | + if(res.data.code==0){ | ||
| 1697 | + prom=res.data.data; | ||
| 1698 | + } | ||
| 1699 | + }) | ||
| 1700 | + } | ||
| 1701 | + if(goodsinfo.prom_type==6){ | ||
| 1702 | + await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | ||
| 1703 | + }).then(res=>{ | ||
| 1704 | + if(res.data.code==0){ | ||
| 1705 | + prom=res.data.data; | ||
| 1706 | + } | ||
| 1707 | + }) | ||
| 1708 | + } | ||
| 1709 | + //----------如果有活动，并且在进行中，就不计算线下库存--------------- | ||
| 1710 | + var now=ut.gettimestamp(); | ||
| 1711 | + if(prom){ | ||
| 1712 | + if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){ | ||
| 1713 | + th.setData({ | ||
| 1714 | + prom_type:goodsinfo.prom_type, | ||
| 1715 | + prom_price:prom.price, | ||
| 1716 | + prom_buy_limit:prom.buy_limit, | ||
| 1717 | + prom_end_time:prom.end_time, | ||
| 1718 | + prom_start_time:prom.start_time, | ||
| 1719 | + prom_st:1, | ||
| 1720 | + }) | ||
| 1721 | + return false; | ||
| 1722 | + } | ||
| 1723 | + } | ||
| 1724 | + //---设置普通商品--- | ||
| 1725 | + th.setData({ | ||
| 1726 | + prom_type:0, | ||
| 1727 | + prom_price:null, | ||
| 1728 | + prom_buy_limit:null, | ||
| 1729 | + prom_end_time:null, | ||
| 1730 | + prom_start_time:null, | ||
| 1731 | + prom_st:null, | ||
| 1732 | + }) | ||
| 1733 | + | ||
| 1732 | }, | 1734 | }, |
| 1733 | - | ||
| 1734 | - | 1735 | + |
| 1736 | + | ||
| 1735 | //---------拿出门店分类和门店------------ | 1737 | //---------拿出门店分类和门店------------ |
| 1736 | get_sto(e) { | 1738 | get_sto(e) { |
| 1737 | var th = this,that=this; | 1739 | var th = this,that=this; |
| 1738 | var timer_get = setInterval(function() { | 1740 | var timer_get = setInterval(function() { |
| 1739 | if (th.data.is_get_local_ok == 0) return false; | 1741 | if (th.data.is_get_local_ok == 0) return false; |
| 1740 | var dd = null, | 1742 | var dd = null, |
| 1741 | - i = getApp().request; | 1743 | + i = getApp().request; |
| 1742 | var g_distr_type = th.data.sele_g.distr_type; | 1744 | var g_distr_type = th.data.sele_g.distr_type; |
| 1743 | if (g_distr_type != 0) { | 1745 | if (g_distr_type != 0) { |
| 1744 | dd = { | 1746 | dd = { |
| @@ -1762,7 +1764,7 @@ Page({ | @@ -1762,7 +1764,7 @@ Page({ | ||
| 1762 | clearInterval(timer_get); | 1764 | clearInterval(timer_get); |
| 1763 | 1765 | ||
| 1764 | if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){ | 1766 | if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){ |
| 1765 | - th.setData({def_pick_store:null}); | 1767 | + th.setData({def_pick_store:null}); |
| 1766 | } | 1768 | } |
| 1767 | 1769 | ||
| 1768 | 1770 | ||
| @@ -1772,7 +1774,7 @@ Page({ | @@ -1772,7 +1774,7 @@ Page({ | ||
| 1772 | }).then(res => { | 1774 | }).then(res => { |
| 1773 | var e = res; | 1775 | var e = res; |
| 1774 | if (e.data.code == 0) { | 1776 | if (e.data.code == 0) { |
| 1775 | - | 1777 | + |
| 1776 | //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 | 1778 | //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 |
| 1777 | if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){ | 1779 | if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){ |
| 1778 | th.setData({ | 1780 | th.setData({ |
| @@ -1781,7 +1783,7 @@ Page({ | @@ -1781,7 +1783,7 @@ Page({ | ||
| 1781 | sto_sele_id: e.data.data.pageData[0].pickup_id, | 1783 | sto_sele_id: e.data.data.pageData[0].pickup_id, |
| 1782 | sto_sele_distr: e.data.data.pageData[0].distr_type | 1784 | sto_sele_distr: e.data.data.pageData[0].distr_type |
| 1783 | }); | 1785 | }); |
| 1784 | - th.data.fir_def_store=e.data.data.pageData[0]; | 1786 | + th.data.fir_def_store=e.data.data.pageData[0]; |
| 1785 | } | 1787 | } |
| 1786 | 1788 | ||
| 1787 | //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- | 1789 | //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- |
| @@ -1794,266 +1796,266 @@ Page({ | @@ -1794,266 +1796,266 @@ Page({ | ||
| 1794 | } | 1796 | } |
| 1795 | e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 | 1797 | e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 |
| 1796 | } | 1798 | } |
| 1797 | - | ||
| 1798 | - | ||
| 1799 | - th.setData({all_pick_list:e.data.data.pageData}); | ||
| 1800 | - | ||
| 1801 | - //--获取线下库存,而且不是新的门店规则,同时不能是活动-- | ||
| 1802 | - if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){ | ||
| 1803 | - setTimeout(function(){ | ||
| 1804 | - th.deal_pickup_dline(e); | ||
| 1805 | - },800) | ||
| 1806 | - }else{ | ||
| 1807 | - setTimeout(function(){ | ||
| 1808 | - th.deal_pickup(e); //--普通门店排版-- | ||
| 1809 | - },800) | ||
| 1810 | - } | ||
| 1811 | - } | 1799 | + |
| 1800 | + | ||
| 1801 | + th.setData({all_pick_list:e.data.data.pageData}); | ||
| 1802 | + | ||
| 1803 | + //--获取线下库存,而且不是新的门店规则,同时不能是活动-- | ||
| 1804 | + if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){ | ||
| 1805 | + setTimeout(function(){ | ||
| 1806 | + th.deal_pickup_dline(e); | ||
| 1807 | + },800) | ||
| 1808 | + }else{ | ||
| 1809 | + setTimeout(function(){ | ||
| 1810 | + th.deal_pickup(e); //--普通门店排版-- | ||
| 1811 | + },800) | ||
| 1812 | + } | ||
| 1813 | + } | ||
| 1812 | }) | 1814 | }) |
| 1813 | }, 200) | 1815 | }, 200) |
| 1814 | 1816 | ||
| 1815 | }, | 1817 | }, |
| 1816 | - | 1818 | + |
| 1817 | //------------处理门店--------------- | 1819 | //------------处理门店--------------- |
| 1818 | deal_pickup(e){ | 1820 | deal_pickup(e){ |
| 1819 | - var th=this; | ||
| 1820 | - | ||
| 1821 | - var g_distr_type=th.data.sele_g.distr_type; | ||
| 1822 | - | ||
| 1823 | - //单总量超出5个的时候 | ||
| 1824 | - if (e.data.data.total > 5) { | ||
| 1825 | - getApp().request.get("/api/weshop/storagecategory/page", { | ||
| 1826 | - data: { | ||
| 1827 | - store_id: o.stoid, | ||
| 1828 | - is_show: 1, | ||
| 1829 | - pageSize: 1000 | ||
| 1830 | - }, | ||
| 1831 | - success: function(ee) { | ||
| 1832 | - if (ee.data.code == 0) { | ||
| 1833 | - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 1834 | - var def_arr = new Array(); | ||
| 1835 | - var ishas = 0; | ||
| 1836 | - //-- 开始就看5个门店 -- | ||
| 1837 | - for (var k = 0; k < 5; k++) { | ||
| 1838 | - if (k == e.data.data.pageData.length) break; | ||
| 1839 | - def_arr.push(e.data.data.pageData[k]); | ||
| 1840 | - } | ||
| 1841 | - | ||
| 1842 | - th.setData({ | ||
| 1843 | - def_pickpu_list: def_arr, | ||
| 1844 | - pickpu_list: ee.data.data.pageData | ||
| 1845 | - }); | ||
| 1846 | - var sto_cate = ee.data.data.pageData; | ||
| 1847 | - var sto_arr = e.data.data.pageData; | ||
| 1848 | - var newarr = new Array(); | ||
| 1849 | - var qita = new Array(); | ||
| 1850 | - | ||
| 1851 | - //----要进行门店分组-------- | ||
| 1852 | - for (var i = 0; i < sto_arr.length; i++) { | ||
| 1853 | - //找一下这个门店有没有在分类数组内 | ||
| 1854 | - var find2 = 0, | ||
| 1855 | - find2name = ""; | ||
| 1856 | - for (var m = 0; m < sto_cate.length; m++) { | ||
| 1857 | - if (sto_arr[i].category_id == sto_cate[m].cat_id) { | ||
| 1858 | - find2 = sto_cate[m].cat_id; | ||
| 1859 | - find2name = sto_cate[m].cat_name; | ||
| 1860 | - break; | ||
| 1861 | - } | ||
| 1862 | - } | ||
| 1863 | - | ||
| 1864 | - if (newarr.length > 0) { | ||
| 1865 | - var find = 0; | ||
| 1866 | - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | ||
| 1867 | - if (find2 != 0) { | ||
| 1868 | - for (var ii = 0; ii < newarr.length; ii++) { | ||
| 1869 | - if (sto_arr[i].category_id == newarr[ii].cat_id) { | ||
| 1870 | - newarr[ii].s_arr.push(sto_arr[i]); | ||
| 1871 | - find = 1; | ||
| 1872 | - break; | ||
| 1873 | - } | ||
| 1874 | - } | ||
| 1875 | - if (find == 0) { | ||
| 1876 | - var arr0 = new Array(); | ||
| 1877 | - arr0.push(sto_arr[i]); | ||
| 1878 | - var item = { | ||
| 1879 | - cat_id: find2, | ||
| 1880 | - name: find2name, | ||
| 1881 | - s_arr: arr0 | ||
| 1882 | - }; | ||
| 1883 | - newarr.push(item); | ||
| 1884 | - } | ||
| 1885 | - } else { | ||
| 1886 | - qita.push(sto_arr[i]); | ||
| 1887 | - } | ||
| 1888 | - } else { | ||
| 1889 | - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | ||
| 1890 | - if (find2 != 0) { | ||
| 1891 | - var arr0 = new Array(); | ||
| 1892 | - arr0.push(sto_arr[i]); | ||
| 1893 | - var item = { | ||
| 1894 | - cat_id: find2, | ||
| 1895 | - name: find2name, | ||
| 1896 | - s_arr: arr0 | ||
| 1897 | - }; | ||
| 1898 | - newarr.push(item); | ||
| 1899 | - } else { | ||
| 1900 | - qita.push(sto_arr[i]); | ||
| 1901 | - } | ||
| 1902 | - } | ||
| 1903 | - } | ||
| 1904 | - | ||
| 1905 | - //----安排其他的分类----- | ||
| 1906 | - if (qita.length > 0) { | ||
| 1907 | - var item = { | ||
| 1908 | - cat_id: -1, | ||
| 1909 | - name: "其他", | ||
| 1910 | - s_arr: qita | ||
| 1911 | - }; | ||
| 1912 | - newarr.push(item); | ||
| 1913 | - } | ||
| 1914 | - th.setData({ | ||
| 1915 | - is_show_sto_cat: 1, | ||
| 1916 | - all_sto: newarr | ||
| 1917 | - }); | ||
| 1918 | - | ||
| 1919 | - } else { | ||
| 1920 | - th.setData({ | ||
| 1921 | - is_show_sto_cat: -1, | ||
| 1922 | - only_pk: e.data.data.pageData | ||
| 1923 | - }); | ||
| 1924 | - //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | ||
| 1925 | - if (!th.data.def_pick_store) { | ||
| 1926 | - th.setData({def_pick_store:e.data.data.pageData[0]}) | ||
| 1927 | - } | ||
| 1928 | - } | ||
| 1929 | - } else { | ||
| 1930 | - th.setData({ | ||
| 1931 | - is_show_sto_cat: -1, | ||
| 1932 | - only_pk: e.data.data.pageData | ||
| 1933 | - }); | ||
| 1934 | - //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | ||
| 1935 | - if (!th.data.def_pick_store) { | ||
| 1936 | - th.setData({def_pick_store:e.data.data.pageData[0]}) | ||
| 1937 | - } | ||
| 1938 | - | ||
| 1939 | - } | ||
| 1940 | - } | ||
| 1941 | - }); | ||
| 1942 | - } else { | ||
| 1943 | - th.setData({ | ||
| 1944 | - is_show_sto_cat: 0, | ||
| 1945 | - only_pk: e.data.data.pageData | ||
| 1946 | - }); | ||
| 1947 | - //-----如果没有默认门店，要取第一个门店作为默认店------ | ||
| 1948 | - if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { | ||
| 1949 | - th.setData({ | ||
| 1950 | - def_pick_store:e.data.data.pageData[0], | ||
| 1951 | - sto_sele_name: e.data.data.pageData[0].pickup_name, | ||
| 1952 | - sto_sele_id: e.data.data.pageData[0].pickup_id, | ||
| 1953 | - sto_sele_distr: e.data.data.pageData[0].distr_type | ||
| 1954 | - }) | ||
| 1955 | - } | ||
| 1956 | - } | 1821 | + var th=this; |
| 1822 | + | ||
| 1823 | + var g_distr_type=th.data.sele_g.distr_type; | ||
| 1824 | + | ||
| 1825 | + //单总量超出5个的时候 | ||
| 1826 | + if (e.data.data.total > 5) { | ||
| 1827 | + getApp().request.get("/api/weshop/storagecategory/page", { | ||
| 1828 | + data: { | ||
| 1829 | + store_id: o.stoid, | ||
| 1830 | + is_show: 1, | ||
| 1831 | + pageSize: 1000 | ||
| 1832 | + }, | ||
| 1833 | + success: function(ee) { | ||
| 1834 | + if (ee.data.code == 0) { | ||
| 1835 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | ||
| 1836 | + var def_arr = new Array(); | ||
| 1837 | + var ishas = 0; | ||
| 1838 | + //-- 开始就看5个门店 -- | ||
| 1839 | + for (var k = 0; k < 5; k++) { | ||
| 1840 | + if (k == e.data.data.pageData.length) break; | ||
| 1841 | + def_arr.push(e.data.data.pageData[k]); | ||
| 1842 | + } | ||
| 1843 | + | ||
| 1844 | + th.setData({ | ||
| 1845 | + def_pickpu_list: def_arr, | ||
| 1846 | + pickpu_list: ee.data.data.pageData | ||
| 1847 | + }); | ||
| 1848 | + var sto_cate = ee.data.data.pageData; | ||
| 1849 | + var sto_arr = e.data.data.pageData; | ||
| 1850 | + var newarr = new Array(); | ||
| 1851 | + var qita = new Array(); | ||
| 1852 | + | ||
| 1853 | + //----要进行门店分组-------- | ||
| 1854 | + for (var i = 0; i < sto_arr.length; i++) { | ||
| 1855 | + //找一下这个门店有没有在分类数组内 | ||
| 1856 | + var find2 = 0, | ||
| 1857 | + find2name = ""; | ||
| 1858 | + for (var m = 0; m < sto_cate.length; m++) { | ||
| 1859 | + if (sto_arr[i].category_id == sto_cate[m].cat_id) { | ||
| 1860 | + find2 = sto_cate[m].cat_id; | ||
| 1861 | + find2name = sto_cate[m].cat_name; | ||
| 1862 | + break; | ||
| 1863 | + } | ||
| 1864 | + } | ||
| 1865 | + | ||
| 1866 | + if (newarr.length > 0) { | ||
| 1867 | + var find = 0; | ||
| 1868 | + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | ||
| 1869 | + if (find2 != 0) { | ||
| 1870 | + for (var ii = 0; ii < newarr.length; ii++) { | ||
| 1871 | + if (sto_arr[i].category_id == newarr[ii].cat_id) { | ||
| 1872 | + newarr[ii].s_arr.push(sto_arr[i]); | ||
| 1873 | + find = 1; | ||
| 1874 | + break; | ||
| 1875 | + } | ||
| 1876 | + } | ||
| 1877 | + if (find == 0) { | ||
| 1878 | + var arr0 = new Array(); | ||
| 1879 | + arr0.push(sto_arr[i]); | ||
| 1880 | + var item = { | ||
| 1881 | + cat_id: find2, | ||
| 1882 | + name: find2name, | ||
| 1883 | + s_arr: arr0 | ||
| 1884 | + }; | ||
| 1885 | + newarr.push(item); | ||
| 1886 | + } | ||
| 1887 | + } else { | ||
| 1888 | + qita.push(sto_arr[i]); | ||
| 1889 | + } | ||
| 1890 | + } else { | ||
| 1891 | + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | ||
| 1892 | + if (find2 != 0) { | ||
| 1893 | + var arr0 = new Array(); | ||
| 1894 | + arr0.push(sto_arr[i]); | ||
| 1895 | + var item = { | ||
| 1896 | + cat_id: find2, | ||
| 1897 | + name: find2name, | ||
| 1898 | + s_arr: arr0 | ||
| 1899 | + }; | ||
| 1900 | + newarr.push(item); | ||
| 1901 | + } else { | ||
| 1902 | + qita.push(sto_arr[i]); | ||
| 1903 | + } | ||
| 1904 | + } | ||
| 1905 | + } | ||
| 1906 | + | ||
| 1907 | + //----安排其他的分类----- | ||
| 1908 | + if (qita.length > 0) { | ||
| 1909 | + var item = { | ||
| 1910 | + cat_id: -1, | ||
| 1911 | + name: "其他", | ||
| 1912 | + s_arr: qita | ||
| 1913 | + }; | ||
| 1914 | + newarr.push(item); | ||
| 1915 | + } | ||
| 1916 | + th.setData({ | ||
| 1917 | + is_show_sto_cat: 1, | ||
| 1918 | + all_sto: newarr | ||
| 1919 | + }); | ||
| 1920 | + | ||
| 1921 | + } else { | ||
| 1922 | + th.setData({ | ||
| 1923 | + is_show_sto_cat: -1, | ||
| 1924 | + only_pk: e.data.data.pageData | ||
| 1925 | + }); | ||
| 1926 | + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | ||
| 1927 | + if (!th.data.def_pick_store) { | ||
| 1928 | + th.setData({def_pick_store:e.data.data.pageData[0]}) | ||
| 1929 | + } | ||
| 1930 | + } | ||
| 1931 | + } else { | ||
| 1932 | + th.setData({ | ||
| 1933 | + is_show_sto_cat: -1, | ||
| 1934 | + only_pk: e.data.data.pageData | ||
| 1935 | + }); | ||
| 1936 | + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | ||
| 1937 | + if (!th.data.def_pick_store) { | ||
| 1938 | + th.setData({def_pick_store:e.data.data.pageData[0]}) | ||
| 1939 | + } | ||
| 1940 | + | ||
| 1941 | + } | ||
| 1942 | + } | ||
| 1943 | + }); | ||
| 1944 | + } else { | ||
| 1945 | + th.setData({ | ||
| 1946 | + is_show_sto_cat: 0, | ||
| 1947 | + only_pk: e.data.data.pageData | ||
| 1948 | + }); | ||
| 1949 | + //-----如果没有默认门店，要取第一个门店作为默认店------ | ||
| 1950 | + if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { | ||
| 1951 | + th.setData({ | ||
| 1952 | + def_pick_store:e.data.data.pageData[0], | ||
| 1953 | + sto_sele_name: e.data.data.pageData[0].pickup_name, | ||
| 1954 | + sto_sele_id: e.data.data.pageData[0].pickup_id, | ||
| 1955 | + sto_sele_distr: e.data.data.pageData[0].distr_type | ||
| 1956 | + }) | ||
| 1957 | + } | ||
| 1958 | + } | ||
| 1957 | }, | 1959 | }, |
| 1958 | //------------处理线下门店库存-------- | 1960 | //------------处理线下门店库存-------- |
| 1959 | deal_pickup_dline(e){ | 1961 | deal_pickup_dline(e){ |
| 1960 | - var pkno=[],th=this; | ||
| 1961 | - if(this.data.def_pick_store){ | ||
| 1962 | - pkno.push(this.data.def_pick_store.pickup_no); | ||
| 1963 | - } | ||
| 1964 | - for(var i in e.data.data.pageData){ | ||
| 1965 | - var item=e.data.data.pageData[i]; | ||
| 1966 | - if(pkno.indexOf(item.pickup_no)<0) | ||
| 1967 | - pkno.push(item.pickup_no); | ||
| 1968 | - } | ||
| 1969 | - var pkno_str=pkno.join(","); | ||
| 1970 | - var o_plist=e.data.data.pageData; | ||
| 1971 | - var new_list=[]; | ||
| 1972 | - var is_find_def_store=0; | ||
| 1973 | - | ||
| 1974 | - | ||
| 1975 | - var g_distr_type=th.data.sele_g.distr_type; | ||
| 1976 | - var lock=[]; | ||
| 1977 | - //先读取门店的lock,采用链式写法，少用await | ||
| 1978 | - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 1979 | - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000} | ||
| 1980 | - }).then(res=>{ | ||
| 1981 | - if(res.data.code==0 && res.data.data.total>0){ | ||
| 1982 | - lock=res.data.data.pageData | ||
| 1983 | - } | ||
| 1984 | - //---通过接口获取门店的线下库存信息-- | ||
| 1985 | - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 1986 | - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000} | ||
| 1987 | - }) | ||
| 1988 | - }).then(res=>{ | ||
| 1989 | - if(res.data.code==0){ | ||
| 1990 | - if(res.data.data.pageData){ | ||
| 1991 | - var plist=res.data.data.pageData; | ||
| 1992 | - var def_pick_store=th.data.def_pick_store; | ||
| 1993 | - //以原来的数组为外循环，保证距离的顺序 | ||
| 1994 | - for(var kk in o_plist){ | ||
| 1995 | - for(var ii in plist){ | ||
| 1996 | - //线下的门店小心 | ||
| 1997 | - var n_item=plist[ii]; | ||
| 1998 | - if(n_item.StorageNo==o_plist[kk].pickup_no){ | ||
| 1999 | - | ||
| 2000 | - //拿到锁库的数量 | ||
| 2001 | - var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock); | ||
| 2002 | - //可出库数大于预出库库存的数量，可以判断为有库存 | ||
| 2003 | - if(n_item.CanOutQty>lock_num){ | ||
| 2004 | - o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num; | ||
| 2005 | - new_list.push(o_plist[kk]); | ||
| 2006 | - //--如果找到默认门店,同时也应该判断配送方式对不对-- | ||
| 2007 | - if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){ | ||
| 2008 | - th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num; | ||
| 2009 | - if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id) | ||
| 2010 | - th.setData({def_pick_store:th.data.fir_def_store}) | ||
| 2011 | - is_find_def_store=1; | ||
| 2012 | - } | ||
| 2013 | - } | ||
| 2014 | - break; | ||
| 2015 | - } | ||
| 2016 | - } | ||
| 2017 | - } | ||
| 2018 | - | ||
| 2019 | - //数据组装下 | ||
| 2020 | - var em={};em.data={};em.data.data={}; | ||
| 2021 | - em.data.data.total=new_list.length; | ||
| 2022 | - em.data.data.pageData=new_list; | ||
| 2023 | - | ||
| 2024 | - //--如果找到默认门店,同时也应该判断配送方式对不对-- | ||
| 2025 | - if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){ | ||
| 2026 | - th.data.fir_def_store.CanOutQty=0; | ||
| 2027 | - //--当选择的门店是客户默认的门店的时候-- | ||
| 2028 | - if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id) { | ||
| 2029 | - th.setData({def_pick_store:th.data.fir_def_store}); | ||
| 2030 | - em.data.data.pageData.unshift(th.data.def_pick_store); | ||
| 2031 | - }else{ | ||
| 2032 | - em.data.data.pageData.splice(1,0,th.data.fir_def_store); | ||
| 2033 | - } | ||
| 2034 | - } | ||
| 2035 | - | ||
| 2036 | - //---把数组组装进去--- | ||
| 2037 | - th.deal_pickup(em); | ||
| 2038 | - }else{ | ||
| 2039 | - th.setData({def_pick_store:null,all_sto:null,only_pk:null}) | ||
| 2040 | - } | ||
| 2041 | - }else{ | ||
| 2042 | - th.setData({def_pick_store:null,all_sto:null,only_pk:null}) | ||
| 2043 | - } | ||
| 2044 | - }) | 1962 | + var pkno=[],th=this; |
| 1963 | + if(this.data.def_pick_store){ | ||
| 1964 | + pkno.push(this.data.def_pick_store.pickup_no); | ||
| 1965 | + } | ||
| 1966 | + for(var i in e.data.data.pageData){ | ||
| 1967 | + var item=e.data.data.pageData[i]; | ||
| 1968 | + if(pkno.indexOf(item.pickup_no)<0) | ||
| 1969 | + pkno.push(item.pickup_no); | ||
| 1970 | + } | ||
| 1971 | + var pkno_str=pkno.join(","); | ||
| 1972 | + var o_plist=e.data.data.pageData; | ||
| 1973 | + var new_list=[]; | ||
| 1974 | + var is_find_def_store=0; | ||
| 1975 | + | ||
| 1976 | + | ||
| 1977 | + var g_distr_type=th.data.sele_g.distr_type; | ||
| 1978 | + var lock=[]; | ||
| 1979 | + //先读取门店的lock,采用链式写法，少用await | ||
| 1980 | + getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 1981 | + data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000} | ||
| 1982 | + }).then(res=>{ | ||
| 1983 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 1984 | + lock=res.data.data.pageData | ||
| 1985 | + } | ||
| 1986 | + //---通过接口获取门店的线下库存信息-- | ||
| 1987 | + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 1988 | + data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000} | ||
| 1989 | + }) | ||
| 1990 | + }).then(res=>{ | ||
| 1991 | + if(res.data.code==0){ | ||
| 1992 | + if(res.data.data.pageData){ | ||
| 1993 | + var plist=res.data.data.pageData; | ||
| 1994 | + var def_pick_store=th.data.def_pick_store; | ||
| 1995 | + //以原来的数组为外循环，保证距离的顺序 | ||
| 1996 | + for(var kk in o_plist){ | ||
| 1997 | + for(var ii in plist){ | ||
| 1998 | + //线下的门店小心 | ||
| 1999 | + var n_item=plist[ii]; | ||
| 2000 | + if(n_item.StorageNo==o_plist[kk].pickup_no){ | ||
| 2001 | + | ||
| 2002 | + //拿到锁库的数量 | ||
| 2003 | + var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock); | ||
| 2004 | + //可出库数大于预出库库存的数量，可以判断为有库存 | ||
| 2005 | + if(n_item.CanOutQty>lock_num){ | ||
| 2006 | + o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num; | ||
| 2007 | + new_list.push(o_plist[kk]); | ||
| 2008 | + //--如果找到默认门店,同时也应该判断配送方式对不对-- | ||
| 2009 | + if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){ | ||
| 2010 | + th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num; | ||
| 2011 | + if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id) | ||
| 2012 | + th.setData({def_pick_store:th.data.fir_def_store}) | ||
| 2013 | + is_find_def_store=1; | ||
| 2014 | + } | ||
| 2015 | + } | ||
| 2016 | + break; | ||
| 2017 | + } | ||
| 2018 | + } | ||
| 2019 | + } | ||
| 2020 | + | ||
| 2021 | + //数据组装下 | ||
| 2022 | + var em={};em.data={};em.data.data={}; | ||
| 2023 | + em.data.data.total=new_list.length; | ||
| 2024 | + em.data.data.pageData=new_list; | ||
| 2025 | + | ||
| 2026 | + //--如果找到默认门店,同时也应该判断配送方式对不对-- | ||
| 2027 | + if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){ | ||
| 2028 | + th.data.fir_def_store.CanOutQty=0; | ||
| 2029 | + //--当选择的门店是客户默认的门店的时候-- | ||
| 2030 | + if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id) { | ||
| 2031 | + th.setData({def_pick_store:th.data.fir_def_store}); | ||
| 2032 | + em.data.data.pageData.unshift(th.data.def_pick_store); | ||
| 2033 | + }else{ | ||
| 2034 | + em.data.data.pageData.splice(1,0,th.data.fir_def_store); | ||
| 2035 | + } | ||
| 2036 | + } | ||
| 2037 | + | ||
| 2038 | + //---把数组组装进去--- | ||
| 2039 | + th.deal_pickup(em); | ||
| 2040 | + }else{ | ||
| 2041 | + th.setData({def_pick_store:null,all_sto:null,only_pk:null}) | ||
| 2042 | + } | ||
| 2043 | + }else{ | ||
| 2044 | + th.setData({def_pick_store:null,all_sto:null,only_pk:null}) | ||
| 2045 | + } | ||
| 2046 | + }) | ||
| 2045 | }, | 2047 | }, |
| 2046 | 2048 | ||
| 2047 | find_lock_num(pick_id,lock){ | 2049 | find_lock_num(pick_id,lock){ |
| 2048 | - var lock_num=0; | ||
| 2049 | - if(!lock) return 0; | ||
| 2050 | - if(lock.length<0) return 0; | ||
| 2051 | - for(var i in lock){ | ||
| 2052 | - if(pick_id==lock[i].pickupId){ | ||
| 2053 | - lock_num+=lock[i].outQty; | ||
| 2054 | - } | ||
| 2055 | - } | ||
| 2056 | - return lock_num; | 2050 | + var lock_num=0; |
| 2051 | + if(!lock) return 0; | ||
| 2052 | + if(lock.length<0) return 0; | ||
| 2053 | + for(var i in lock){ | ||
| 2054 | + if(pick_id==lock[i].pickupId){ | ||
| 2055 | + lock_num+=lock[i].outQty; | ||
| 2056 | + } | ||
| 2057 | + } | ||
| 2058 | + return lock_num; | ||
| 2057 | }, | 2059 | }, |
| 2058 | 2060 | ||
| 2059 | //----------取货门店被点击的效果------ | 2061 | //----------取货门店被点击的效果------ |
| @@ -2113,12 +2115,12 @@ Page({ | @@ -2113,12 +2115,12 @@ Page({ | ||
| 2113 | var tot = res.data.data.total; | 2115 | var tot = res.data.data.total; |
| 2114 | e.data.c_curr_p++; | 2116 | e.data.c_curr_p++; |
| 2115 | e.setData({ | 2117 | e.setData({ |
| 2116 | - com_num: tot, //已经有加载 | 2118 | + com_num: tot, //已经有加载 |
| 2117 | }); | 2119 | }); |
| 2118 | if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | 2120 | if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 2119 | - rs_data=res.data.data.pageData; | 2121 | + rs_data=res.data.data.pageData; |
| 2120 | }else{ | 2122 | }else{ |
| 2121 | - th.setData({comments_no_more:1,auto:1}); | 2123 | + th.setData({comments_no_more:1,auto:1}); |
| 2122 | } | 2124 | } |
| 2123 | }) | 2125 | }) |
| 2124 | 2126 | ||
| @@ -2126,30 +2128,30 @@ Page({ | @@ -2126,30 +2128,30 @@ Page({ | ||
| 2126 | //var cda = th.data.comments; | 2128 | //var cda = th.data.comments; |
| 2127 | var cda = rs_data,com_data=th.data.comments; | 2129 | var cda = rs_data,com_data=th.data.comments; |
| 2128 | for (var ind in cda) { | 2130 | for (var ind in cda) { |
| 2129 | - var ep = cda[ind]; | ||
| 2130 | - if (cda[ind].head_pic == '') { | ||
| 2131 | - cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png"; | ||
| 2132 | - } | ||
| 2133 | - if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) { | ||
| 2134 | - cda[ind].weapp_img = JSON.parse(ep.weapp_img); | ||
| 2135 | - } | ||
| 2136 | - if (ep.img != "" && ut.isString(ep.img)) { | ||
| 2137 | - cda[ind].img = ut.unserialize(ep.img); | ||
| 2138 | - } | 2131 | + var ep = cda[ind]; |
| 2132 | + if (cda[ind].head_pic == '') { | ||
| 2133 | + cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png"; | ||
| 2134 | + } | ||
| 2135 | + if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) { | ||
| 2136 | + cda[ind].weapp_img = JSON.parse(ep.weapp_img); | ||
| 2137 | + } | ||
| 2138 | + if (ep.img != "" && ut.isString(ep.img)) { | ||
| 2139 | + cda[ind].img = ut.unserialize(ep.img); | ||
| 2140 | + } | ||
| 2139 | 2141 | ||
| 2140 | - //--测量多有字的宽带，计算有多少行-- | ||
| 2141 | - var widh=ut.measureText(ep.content,30); | ||
| 2142 | - var lines=widh/712; | ||
| 2143 | - cda[ind].seeMore=false; | ||
| 2144 | - if(lines>3) cda[ind].seeMore=true; | ||
| 2145 | - | ||
| 2146 | - await getApp().request.promiseGet("/api/weshop/comment/pageComment", { | ||
| 2147 | - data: {store_id: o.stoid, parent_id: ep.comment_id } | ||
| 2148 | - }).then(res => { | ||
| 2149 | - if (res.data.data.pageData && res.data.data.pageData.length > 0) { | ||
| 2150 | - cda[ind].replay_list = res.data.data.pageData; | ||
| 2151 | - } | ||
| 2152 | - }) | 2142 | + //--测量多有字的宽带，计算有多少行-- |
| 2143 | + var widh=ut.measureText(ep.content,30); | ||
| 2144 | + var lines=widh/712; | ||
| 2145 | + cda[ind].seeMore=false; | ||
| 2146 | + if(lines>3) cda[ind].seeMore=true; | ||
| 2147 | + | ||
| 2148 | + await getApp().request.promiseGet("/api/weshop/comment/pageComment", { | ||
| 2149 | + data: {store_id: o.stoid, parent_id: ep.comment_id } | ||
| 2150 | + }).then(res => { | ||
| 2151 | + if (res.data.data.pageData && res.data.data.pageData.length > 0) { | ||
| 2152 | + cda[ind].replay_list = res.data.data.pageData; | ||
| 2153 | + } | ||
| 2154 | + }) | ||
| 2153 | } | 2155 | } |
| 2154 | 2156 | ||
| 2155 | if (!com_data) com_data = cda; | 2157 | if (!com_data) com_data = cda; |
| @@ -2174,7 +2176,7 @@ Page({ | @@ -2174,7 +2176,7 @@ Page({ | ||
| 2174 | //--------检查是否活动，活动是否开始，或者是否结束------- | 2176 | //--------检查是否活动，活动是否开始，或者是否结束------- |
| 2175 | async check_prom(gid, prom_type, prom_id) { | 2177 | async check_prom(gid, prom_type, prom_id) { |
| 2176 | var ee = this, | 2178 | var ee = this, |
| 2177 | - th = ee; | 2179 | + th = ee; |
| 2178 | if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 4 || prom_type == 5) { | 2180 | if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 4 || prom_type == 5) { |
| 2179 | this.setData({ | 2181 | this.setData({ |
| 2180 | prom_type: 0, | 2182 | prom_type: 0, |
| @@ -2197,91 +2199,91 @@ Page({ | @@ -2197,91 +2199,91 @@ Page({ | ||
| 2197 | }); | 2199 | }); |
| 2198 | //拿取价格并且判断时间-- | 2200 | //拿取价格并且判断时间-- |
| 2199 | getApp().request.get("/api/ms/flash_sale/get/" + | 2201 | getApp().request.get("/api/ms/flash_sale/get/" + |
| 2200 | - os.stoid + "/" + prom_id, { | ||
| 2201 | - success: function(t) { | ||
| 2202 | - if (t.data.code != 0) { | ||
| 2203 | - ee.setData({ | ||
| 2204 | - prom_type: 0, | ||
| 2205 | - isshow: 1, | ||
| 2206 | - }); | ||
| 2207 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2208 | - return false; | ||
| 2209 | - } | ||
| 2210 | - //----已经结束----- | ||
| 2211 | - if (t.data.data.is_end == 1) { | ||
| 2212 | - ee.setData({ | ||
| 2213 | - prom_type: 0, | ||
| 2214 | - isshow: 1, | ||
| 2215 | - }); | ||
| 2216 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2217 | - ee.get_sto(); | ||
| 2218 | - return false; | ||
| 2219 | - } | ||
| 2220 | - //----已经过期----- | ||
| 2221 | - var now = ut.gettimestamp(); | ||
| 2222 | - if (t.data.data.end_time < now) { | ||
| 2223 | - ee.setData({ | ||
| 2224 | - prom_type: 0, | ||
| 2225 | - isshow: 1, | ||
| 2226 | - }); | ||
| 2227 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2228 | - return false; | ||
| 2229 | - } | ||
| 2230 | - | ||
| 2231 | - /*-- 还没有开始预热的也不显示 --*/ | ||
| 2232 | - if (t.data.data.show_time > now) { | ||
| 2233 | - ee.setData({ | ||
| 2234 | - prom_type: 0, | ||
| 2235 | - isshow: 1, | ||
| 2236 | - }); | ||
| 2237 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2238 | - ee.get_sto(); | ||
| 2239 | - return false; | ||
| 2240 | - } | ||
| 2241 | - | ||
| 2242 | - var t_gd = ee.data.data; | ||
| 2243 | - var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); | ||
| 2244 | - var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); | 2202 | + os.stoid + "/" + prom_id, { |
| 2203 | + success: function(t) { | ||
| 2204 | + if (t.data.code != 0) { | ||
| 2205 | + ee.setData({ | ||
| 2206 | + prom_type: 0, | ||
| 2207 | + isshow: 1, | ||
| 2208 | + }); | ||
| 2209 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2210 | + return false; | ||
| 2211 | + } | ||
| 2212 | + //----已经结束----- | ||
| 2213 | + if (t.data.data.is_end == 1) { | ||
| 2214 | + ee.setData({ | ||
| 2215 | + prom_type: 0, | ||
| 2216 | + isshow: 1, | ||
| 2217 | + }); | ||
| 2218 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2219 | + ee.get_sto(); | ||
| 2220 | + return false; | ||
| 2221 | + } | ||
| 2222 | + //----已经过期----- | ||
| 2223 | + var now = ut.gettimestamp(); | ||
| 2224 | + if (t.data.data.end_time < now) { | ||
| 2225 | + ee.setData({ | ||
| 2226 | + prom_type: 0, | ||
| 2227 | + isshow: 1, | ||
| 2228 | + }); | ||
| 2229 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2230 | + return false; | ||
| 2231 | + } | ||
| 2245 | 2232 | ||
| 2233 | + /*-- 还没有开始预热的也不显示 --*/ | ||
| 2234 | + if (t.data.data.show_time > now) { | ||
| 2246 | ee.setData({ | 2235 | ee.setData({ |
| 2247 | - prom_price: t.data.data.price, | ||
| 2248 | - prom_type: 1, | ||
| 2249 | - prom_id: prom_id, | ||
| 2250 | - prom_buy_limit: t.data.data.buy_limit, | ||
| 2251 | - prom_act: t.data.data, | ||
| 2252 | - prom_end_time: prom_end_time, | ||
| 2253 | - prom_start_time: prom_start_time, | 2236 | + prom_type: 0, |
| 2254 | isshow: 1, | 2237 | isshow: 1, |
| 2255 | }); | 2238 | }); |
| 2256 | - | ||
| 2257 | - ee.get_sto(); | 2239 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); |
| 2240 | + ee.get_sto(); | ||
| 2241 | + return false; | ||
| 2242 | + } | ||
| 2258 | 2243 | ||
| 2244 | + var t_gd = ee.data.data; | ||
| 2245 | + var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); | ||
| 2246 | + var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); | ||
| 2247 | + | ||
| 2248 | + ee.setData({ | ||
| 2249 | + prom_price: t.data.data.price, | ||
| 2250 | + prom_type: 1, | ||
| 2251 | + prom_id: prom_id, | ||
| 2252 | + prom_buy_limit: t.data.data.buy_limit, | ||
| 2253 | + prom_act: t.data.data, | ||
| 2254 | + prom_end_time: prom_end_time, | ||
| 2255 | + prom_start_time: prom_start_time, | ||
| 2256 | + isshow: 1, | ||
| 2257 | + }); | ||
| 2258 | + | ||
| 2259 | + ee.get_sto(); | ||
| 2259 | 2260 | ||
| 2260 | - var newTime = ut.gettimestamp(); | ||
| 2261 | - var endTime2 = t.data.data.end_time; | ||
| 2262 | - var endTime1 = t.data.data.start_time; | ||
| 2263 | 2261 | ||
| 2264 | - //---苹果机不兼容--- | ||
| 2265 | - /*---- | ||
| 2266 | - var endTime2 = new Date(prom_end_time).getTime(); | ||
| 2267 | - var endTime1 = new Date(prom_start_time).getTime();----*/ | 2262 | + var newTime = ut.gettimestamp(); |
| 2263 | + var endTime2 = t.data.data.end_time; | ||
| 2264 | + var endTime1 = t.data.data.start_time; | ||
| 2268 | 2265 | ||
| 2269 | - if (endTime1 > newTime) { | 2266 | + //---苹果机不兼容--- |
| 2267 | + /*---- | ||
| 2268 | + var endTime2 = new Date(prom_end_time).getTime(); | ||
| 2269 | + var endTime1 = new Date(prom_start_time).getTime();----*/ | ||
| 2270 | + | ||
| 2271 | + if (endTime1 > newTime) { | ||
| 2272 | + ee.setData({ | ||
| 2273 | + prom_time_text: '距秒杀开始还有' | ||
| 2274 | + }) | ||
| 2275 | + ee.countDown(endTime1, 0); | ||
| 2276 | + } else { | ||
| 2277 | + if (endTime2 > newTime) { | ||
| 2270 | ee.setData({ | 2278 | ee.setData({ |
| 2271 | - prom_time_text: '距秒杀开始还有' | 2279 | + prom_time_text: '距秒杀结束还有', |
| 2280 | + prom_st: 1 | ||
| 2272 | }) | 2281 | }) |
| 2273 | - ee.countDown(endTime1, 0); | ||
| 2274 | - } else { | ||
| 2275 | - if (endTime2 > newTime) { | ||
| 2276 | - ee.setData({ | ||
| 2277 | - prom_time_text: '距秒杀结束还有', | ||
| 2278 | - prom_st: 1 | ||
| 2279 | - }) | ||
| 2280 | - ee.countDown(endTime2); | ||
| 2281 | - } | 2282 | + ee.countDown(endTime2); |
| 2282 | } | 2283 | } |
| 2283 | } | 2284 | } |
| 2284 | - }); | 2285 | + } |
| 2286 | + }); | ||
| 2285 | } | 2287 | } |
| 2286 | }) | 2288 | }) |
| 2287 | } | 2289 | } |
| @@ -2301,152 +2303,152 @@ Page({ | @@ -2301,152 +2303,152 @@ Page({ | ||
| 2301 | }); | 2303 | }); |
| 2302 | //拿取价格并且判断时间-- | 2304 | //拿取价格并且判断时间-- |
| 2303 | getApp().request.get("/api/weshop/teamlist/get/" + | 2305 | getApp().request.get("/api/weshop/teamlist/get/" + |
| 2304 | - os.stoid + "/" + prom_id, { | ||
| 2305 | - success: function(t) { | ||
| 2306 | - if (t.data.code != 0) { | ||
| 2307 | - ee.setData({ | ||
| 2308 | - prom_type: 0, | ||
| 2309 | - isshow: 1, | ||
| 2310 | - }); | ||
| 2311 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2312 | - ee.get_sto(); | ||
| 2313 | - return false; | ||
| 2314 | - } | ||
| 2315 | - //----已经结束----- | ||
| 2316 | - if (t.data.data.is_end == 1) { | ||
| 2317 | - ee.setData({ | ||
| 2318 | - prom_type: 0, | ||
| 2319 | - isshow: 1, | ||
| 2320 | - }); | ||
| 2321 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2322 | - return false; | ||
| 2323 | - } | ||
| 2324 | - //----已经过期----- | ||
| 2325 | - var now = ut.gettimestamp(); | ||
| 2326 | - if (t.data.data.end_time < now) { | ||
| 2327 | - ee.setData({ | ||
| 2328 | - prom_type: 0, | ||
| 2329 | - isshow: 1, | ||
| 2330 | - }); | ||
| 2331 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2332 | - ee.get_sto(); | ||
| 2333 | - return false; | ||
| 2334 | - } | 2306 | + os.stoid + "/" + prom_id, { |
| 2307 | + success: function(t) { | ||
| 2308 | + if (t.data.code != 0) { | ||
| 2309 | + ee.setData({ | ||
| 2310 | + prom_type: 0, | ||
| 2311 | + isshow: 1, | ||
| 2312 | + }); | ||
| 2313 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2314 | + ee.get_sto(); | ||
| 2315 | + return false; | ||
| 2316 | + } | ||
| 2317 | + //----已经结束----- | ||
| 2318 | + if (t.data.data.is_end == 1) { | ||
| 2319 | + ee.setData({ | ||
| 2320 | + prom_type: 0, | ||
| 2321 | + isshow: 1, | ||
| 2322 | + }); | ||
| 2323 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2324 | + return false; | ||
| 2325 | + } | ||
| 2326 | + //----已经过期----- | ||
| 2327 | + var now = ut.gettimestamp(); | ||
| 2328 | + if (t.data.data.end_time < now) { | ||
| 2329 | + ee.setData({ | ||
| 2330 | + prom_type: 0, | ||
| 2331 | + isshow: 1, | ||
| 2332 | + }); | ||
| 2333 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2334 | + ee.get_sto(); | ||
| 2335 | + return false; | ||
| 2336 | + } | ||
| 2335 | 2337 | ||
| 2336 | - /*-- 还没有开始预热的也不显示 --*/ | ||
| 2337 | - if (t.data.data.show_time > now) { | ||
| 2338 | - ee.setData({ | ||
| 2339 | - prom_type: 0, | ||
| 2340 | - isshow: 1, | ||
| 2341 | - }); | ||
| 2342 | - ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2343 | - ee.get_sto(); | ||
| 2344 | - return false; | ||
| 2345 | - } | 2338 | + /*-- 还没有开始预热的也不显示 --*/ |
| 2339 | + if (t.data.data.show_time > now) { | ||
| 2340 | + ee.setData({ | ||
| 2341 | + prom_type: 0, | ||
| 2342 | + isshow: 1, | ||
| 2343 | + }); | ||
| 2344 | + ee.get_sku(os.stoid, ee.data.data.sku, gid); | ||
| 2345 | + ee.get_sto(); | ||
| 2346 | + return false; | ||
| 2347 | + } | ||
| 2346 | 2348 | ||
| 2347 | - //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中------- | ||
| 2348 | - getApp().request.get("/api/weshop/order/page", { | ||
| 2349 | - data: { | ||
| 2350 | - pt_prom_id: prom_id, | ||
| 2351 | - user_id: oo.user_id, | ||
| 2352 | - store_id: os.stoid, | ||
| 2353 | - pageSize: 1, | ||
| 2354 | - page: 1 | ||
| 2355 | - }, | ||
| 2356 | - success: function(e) { | ||
| 2357 | - if (e.data.code == 0 && e.data.data.pageData.length > 0) { | ||
| 2358 | - var odr = e.data.data.pageData[0]; | ||
| 2359 | - th.data.buy_order = odr; | ||
| 2360 | - if (odr.pt_status == 0 && odr.order_status == 1) { | 2349 | + //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中------- |
| 2350 | + getApp().request.get("/api/weshop/order/page", { | ||
| 2351 | + data: { | ||
| 2352 | + pt_prom_id: prom_id, | ||
| 2353 | + user_id: oo.user_id, | ||
| 2354 | + store_id: os.stoid, | ||
| 2355 | + pageSize: 1, | ||
| 2356 | + page: 1 | ||
| 2357 | + }, | ||
| 2358 | + success: function(e) { | ||
| 2359 | + if (e.data.code == 0 && e.data.data.pageData.length > 0) { | ||
| 2360 | + var odr = e.data.data.pageData[0]; | ||
| 2361 | + th.data.buy_order = odr; | ||
| 2362 | + if (odr.pt_status == 0 && odr.order_status == 1) { | ||
| 2363 | + th.setData({ | ||
| 2364 | + user_order_pt_state: 1 | ||
| 2365 | + }); | ||
| 2366 | + } | ||
| 2367 | + if (odr.pt_status == 1 && odr.order_status == 1) { | ||
| 2368 | + if (odr.is_zsorder == 4) { | ||
| 2369 | + getApp().request.promiseGet("/api/weshop/teamgroup/page/", { | ||
| 2370 | + data: { | ||
| 2371 | + store_id: os.stoid, | ||
| 2372 | + team_id: odr.pt_prom_id, | ||
| 2373 | + listno: odr.pt_listno | ||
| 2374 | + } | ||
| 2375 | + }).then(res => { | ||
| 2376 | + var now = ut.gettimestamp(); | ||
| 2377 | + var tgr = res.data.data.pageData[0]; | ||
| 2378 | + //如果团的时间已经到了 | ||
| 2379 | + if (now >= tgr.kt_end_time) { | ||
| 2380 | + th.update_jiti(tgr.id); | ||
| 2381 | + } else { | ||
| 2382 | + th.setData({ | ||
| 2383 | + user_order_pt_state: 2 | ||
| 2384 | + }); | ||
| 2385 | + } | ||
| 2386 | + }) | ||
| 2387 | + | ||
| 2388 | + } else { | ||
| 2361 | th.setData({ | 2389 | th.setData({ |
| 2362 | - user_order_pt_state: 1 | 2390 | + user_order_pt_state: 2 |
| 2363 | }); | 2391 | }); |
| 2364 | } | 2392 | } |
| 2365 | - if (odr.pt_status == 1 && odr.order_status == 1) { | ||
| 2366 | - if (odr.is_zsorder == 4) { | ||
| 2367 | - getApp().request.promiseGet("/api/weshop/teamgroup/page/", { | ||
| 2368 | - data: { | ||
| 2369 | - store_id: os.stoid, | ||
| 2370 | - team_id: odr.pt_prom_id, | ||
| 2371 | - listno: odr.pt_listno | ||
| 2372 | - } | ||
| 2373 | - }).then(res => { | ||
| 2374 | - var now = ut.gettimestamp(); | ||
| 2375 | - var tgr = res.data.data.pageData[0]; | ||
| 2376 | - //如果团的时间已经到了 | ||
| 2377 | - if (now >= tgr.kt_end_time) { | ||
| 2378 | - th.update_jiti(tgr.id); | ||
| 2379 | - } else { | ||
| 2380 | - th.setData({ | ||
| 2381 | - user_order_pt_state: 2 | ||
| 2382 | - }); | ||
| 2383 | - } | ||
| 2384 | - }) | ||
| 2385 | - | ||
| 2386 | - } else { | ||
| 2387 | - th.setData({ | ||
| 2388 | - user_order_pt_state: 2 | ||
| 2389 | - }); | ||
| 2390 | - } | ||
| 2391 | - } | 2393 | + } |
| 2392 | 2394 | ||
| 2393 | - if (odr.pt_status == 2 && odr.is_zsorder == 4) { | ||
| 2394 | - th.setData({ | ||
| 2395 | - user_order_pt_state: 3, | ||
| 2396 | - }); | ||
| 2397 | - th.data.wk_order_id = odr.order_id; | ||
| 2398 | - } | 2395 | + if (odr.pt_status == 2 && odr.is_zsorder == 4) { |
| 2396 | + th.setData({ | ||
| 2397 | + user_order_pt_state: 3, | ||
| 2398 | + }); | ||
| 2399 | + th.data.wk_order_id = odr.order_id; | ||
| 2399 | } | 2400 | } |
| 2400 | - }, | ||
| 2401 | - }); | 2401 | + } |
| 2402 | + }, | ||
| 2403 | + }); | ||
| 2402 | 2404 | ||
| 2403 | - //----------查看阶梯团------------ | ||
| 2404 | - if (t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) { | ||
| 2405 | - t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist); | ||
| 2406 | - var max_num = 0; | ||
| 2407 | - t.data.data.ct_rylist.forEach(function(val, ind) { | ||
| 2408 | - if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum); | ||
| 2409 | - }) | ||
| 2410 | - t.data.data.max_ct_num = max_num; | ||
| 2411 | - } | 2405 | + //----------查看阶梯团------------ |
| 2406 | + if (t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) { | ||
| 2407 | + t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist); | ||
| 2408 | + var max_num = 0; | ||
| 2409 | + t.data.data.ct_rylist.forEach(function(val, ind) { | ||
| 2410 | + if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum); | ||
| 2411 | + }) | ||
| 2412 | + t.data.data.max_ct_num = max_num; | ||
| 2413 | + } | ||
| 2412 | 2414 | ||
| 2413 | - var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); | ||
| 2414 | - var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); | ||
| 2415 | - ee.setData({ | ||
| 2416 | - prom_price: t.data.data.price, | ||
| 2417 | - prom_type: 6, | ||
| 2418 | - prom_id: prom_id, | ||
| 2419 | - prom_buy_limit: t.data.data.buy_limit, | ||
| 2420 | - prom_act: t.data.data, | ||
| 2421 | - prom_end_time: prom_end_time, | ||
| 2422 | - prom_start_time: prom_start_time, | ||
| 2423 | - isshow: 1, | ||
| 2424 | - }); | ||
| 2425 | - | ||
| 2426 | - ee.get_sto(); | 2415 | + var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); |
| 2416 | + var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); | ||
| 2417 | + ee.setData({ | ||
| 2418 | + prom_price: t.data.data.price, | ||
| 2419 | + prom_type: 6, | ||
| 2420 | + prom_id: prom_id, | ||
| 2421 | + prom_buy_limit: t.data.data.buy_limit, | ||
| 2422 | + prom_act: t.data.data, | ||
| 2423 | + prom_end_time: prom_end_time, | ||
| 2424 | + prom_start_time: prom_start_time, | ||
| 2425 | + isshow: 1, | ||
| 2426 | + }); | ||
| 2427 | + | ||
| 2428 | + ee.get_sto(); | ||
| 2427 | 2429 | ||
| 2428 | - var newTime = now; | ||
| 2429 | - var endTime2 = t.data.data.end_time; | ||
| 2430 | - var endTime1 = t.data.data.start_time; | 2430 | + var newTime = now; |
| 2431 | + var endTime2 = t.data.data.end_time; | ||
| 2432 | + var endTime1 = t.data.data.start_time; | ||
| 2431 | 2433 | ||
| 2432 | - if (endTime1 > newTime) { | 2434 | + if (endTime1 > newTime) { |
| 2435 | + ee.setData({ | ||
| 2436 | + prom_time_text: '距拼单开始还剩:' | ||
| 2437 | + }) | ||
| 2438 | + ee.countDown(endTime1, 0); | ||
| 2439 | + } else { | ||
| 2440 | + if (endTime2 > newTime) { | ||
| 2433 | ee.setData({ | 2441 | ee.setData({ |
| 2434 | - prom_time_text: '距拼单开始还剩:' | 2442 | + prom_time_text: '距拼单结束还剩:', |
| 2443 | + prom_st: 1 | ||
| 2435 | }) | 2444 | }) |
| 2436 | - ee.countDown(endTime1, 0); | ||
| 2437 | - } else { | ||
| 2438 | - if (endTime2 > newTime) { | ||
| 2439 | - ee.setData({ | ||
| 2440 | - prom_time_text: '距拼单结束还剩:', | ||
| 2441 | - prom_st: 1 | ||
| 2442 | - }) | ||
| 2443 | - ee.countDown(endTime2); | ||
| 2444 | - } | 2445 | + ee.countDown(endTime2); |
| 2445 | } | 2446 | } |
| 2446 | - //-------查看有多少人在开这个团------- | ||
| 2447 | - th.get_team_group(prom_id); | ||
| 2448 | } | 2447 | } |
| 2449 | - }); | 2448 | + //-------查看有多少人在开这个团------- |
| 2449 | + th.get_team_group(prom_id); | ||
| 2450 | + } | ||
| 2451 | + }); | ||
| 2450 | } | 2452 | } |
| 2451 | }) | 2453 | }) |
| 2452 | } | 2454 | } |
| @@ -2456,8 +2458,8 @@ Page({ | @@ -2456,8 +2458,8 @@ Page({ | ||
| 2456 | //--获取有多少人在开团-- | 2458 | //--获取有多少人在开团-- |
| 2457 | async get_team_group(prom_id) { | 2459 | async get_team_group(prom_id) { |
| 2458 | var teamgroup = [], | 2460 | var teamgroup = [], |
| 2459 | - th = this, | ||
| 2460 | - grounp_tatal = 0; | 2461 | + th = this, |
| 2462 | + grounp_tatal = 0; | ||
| 2461 | //如果活动是开团不是商家团 | 2463 | //如果活动是开团不是商家团 |
| 2462 | if (this.data.prom_act.kttype > 1) { | 2464 | if (this.data.prom_act.kttype > 1) { |
| 2463 | //获取活动从表信息team_id | 2465 | //获取活动从表信息team_id |
| @@ -2573,8 +2575,8 @@ Page({ | @@ -2573,8 +2575,8 @@ Page({ | ||
| 2573 | //-------------获取购买数量的总函数---------------- | 2575 | //-------------获取购买数量的总函数---------------- |
| 2574 | get_buy_num: function(gd, func) { | 2576 | get_buy_num: function(gd, func) { |
| 2575 | var map = this.data.g_buy_num, | 2577 | var map = this.data.g_buy_num, |
| 2576 | - th = this, | ||
| 2577 | - user_id = getApp().globalData.user_id; | 2578 | + th = this, |
| 2579 | + user_id = getApp().globalData.user_id; | ||
| 2578 | if (user_id == null) { | 2580 | if (user_id == null) { |
| 2579 | map.set(gd.goods_id, 0); | 2581 | map.set(gd.goods_id, 0); |
| 2580 | th.setData({ | 2582 | th.setData({ |
| @@ -2759,8 +2761,8 @@ Page({ | @@ -2759,8 +2761,8 @@ Page({ | ||
| 2759 | return; | 2761 | return; |
| 2760 | } | 2762 | } |
| 2761 | var e = this, | 2763 | var e = this, |
| 2762 | - th = e, | ||
| 2763 | - o = this.data.sele_g; | 2764 | + th = e, |
| 2765 | + o = this.data.sele_g; | ||
| 2764 | if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); | 2766 | if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); |
| 2765 | 2767 | ||
| 2766 | //----------添加到购物车时，要判断限购数量，-------- | 2768 | //----------添加到购物车时，要判断限购数量，-------- |
| @@ -2773,10 +2775,10 @@ Page({ | @@ -2773,10 +2775,10 @@ Page({ | ||
| 2773 | title: '提示', | 2775 | title: '提示', |
| 2774 | content: '超出商品限购' | 2776 | content: '超出商品限购' |
| 2775 | }); | 2777 | }); |
| 2776 | - | ||
| 2777 | - var num=th.data.prom_buy_limit-th.data.prom_buy_num; | ||
| 2778 | - if(num<0) num=0; | ||
| 2779 | - th.setData({goodsInputNum:num}) | 2778 | + |
| 2779 | + var num=th.data.prom_buy_limit-th.data.prom_buy_num; | ||
| 2780 | + if(num<0) num=0; | ||
| 2781 | + th.setData({goodsInputNum:num}) | ||
| 2780 | return false; | 2782 | return false; |
| 2781 | } | 2783 | } |
| 2782 | } | 2784 | } |
| @@ -2787,42 +2789,42 @@ Page({ | @@ -2787,42 +2789,42 @@ Page({ | ||
| 2787 | title: '提示', | 2789 | title: '提示', |
| 2788 | content: '超出商品活动限购' | 2790 | content: '超出商品活动限购' |
| 2789 | }); | 2791 | }); |
| 2790 | - | ||
| 2791 | - var num=th.data.prom_buy_limit-th.data.prom_buy_num; | ||
| 2792 | - if(num<0) num=0; | ||
| 2793 | - th.setData({goodsInputNum:num}) | 2792 | + |
| 2793 | + var num=th.data.prom_buy_limit-th.data.prom_buy_num; | ||
| 2794 | + if(num<0) num=0; | ||
| 2795 | + th.setData({goodsInputNum:num}) | ||
| 2794 | return false; | 2796 | return false; |
| 2795 | } | 2797 | } |
| 2796 | } | 2798 | } |
| 2797 | 2799 | ||
| 2798 | var redis_num = 0 | 2800 | var redis_num = 0 |
| 2799 | - //不是普通购买的时候 | ||
| 2800 | - if(th.data.is_normal!=1){ | ||
| 2801 | - //-------判断活动是否抢光--------- | ||
| 2802 | - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, { | ||
| 2803 | - 1: 1 | ||
| 2804 | - }).then(res => { | ||
| 2805 | - redis_num = res.data.data; | ||
| 2806 | - }) | ||
| 2807 | - | ||
| 2808 | - if (th.data.goodsInputNum > redis_num) { | ||
| 2809 | - wx.showModal({ | ||
| 2810 | - title: '提示', | ||
| 2811 | - content: '超出商品活动库存' | ||
| 2812 | - }); | ||
| 2813 | - | ||
| 2814 | - th.setData({goodsInputNum:redis_num}) | ||
| 2815 | - | ||
| 2816 | - return false; | ||
| 2817 | - } | ||
| 2818 | - } | 2801 | + //不是普通购买的时候 |
| 2802 | + if(th.data.is_normal!=1){ | ||
| 2803 | + //-------判断活动是否抢光--------- | ||
| 2804 | + await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, { | ||
| 2805 | + 1: 1 | ||
| 2806 | + }).then(res => { | ||
| 2807 | + redis_num = res.data.data; | ||
| 2808 | + }) | ||
| 2809 | + | ||
| 2810 | + if (th.data.goodsInputNum > redis_num) { | ||
| 2811 | + wx.showModal({ | ||
| 2812 | + title: '提示', | ||
| 2813 | + content: '超出商品活动库存' | ||
| 2814 | + }); | ||
| 2815 | + | ||
| 2816 | + th.setData({goodsInputNum:redis_num}) | ||
| 2817 | + | ||
| 2818 | + return false; | ||
| 2819 | + } | ||
| 2820 | + } | ||
| 2819 | 2821 | ||
| 2820 | if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); | 2822 | if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); |
| 2821 | - if (th.data.goodsInputNum > o.store_count) { | ||
| 2822 | - th.setData({goodsInputNum:o.store_count}) | ||
| 2823 | - return s.my_warnning("超出商品库存", 0, th); | ||
| 2824 | - } | ||
| 2825 | - | 2823 | + if (th.data.goodsInputNum > o.store_count) { |
| 2824 | + th.setData({goodsInputNum:o.store_count}) | ||
| 2825 | + return s.my_warnning("超出商品库存", 0, th); | ||
| 2826 | + } | ||
| 2827 | + | ||
| 2826 | if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) | 2828 | if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) |
| 2827 | this.setData({ | 2829 | this.setData({ |
| 2828 | sto_sele_name: "" | 2830 | sto_sele_name: "" |
| @@ -2860,30 +2862,30 @@ Page({ | @@ -2860,30 +2862,30 @@ Page({ | ||
| 2860 | newd.room_id=getApp().globalData.room_id; | 2862 | newd.room_id=getApp().globalData.room_id; |
| 2861 | } | 2863 | } |
| 2862 | }else{ | 2864 | }else{ |
| 2863 | - if(newd.goods_id==getApp().globalData.room_goods_id){ | ||
| 2864 | - newd.room_id=getApp().globalData.room_id; | ||
| 2865 | - } | 2865 | + if(newd.goods_id==getApp().globalData.room_goods_id){ |
| 2866 | + newd.room_id=getApp().globalData.room_id; | ||
| 2867 | + } | ||
| 2866 | } | 2868 | } |
| 2867 | 2869 | ||
| 2868 | 2870 | ||
| 2869 | 2871 | ||
| 2870 | - //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ | 2872 | + //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ |
| 2871 | 2873 | ||
| 2872 | - if(th.data.is_normal == 1){ | ||
| 2873 | - var conf=th.data.bconfig; | ||
| 2874 | - if(conf.switch_list){ | ||
| 2875 | - var s_list=JSON.parse(conf.switch_list); | ||
| 2876 | - //如果后台有开启等级价的功能 | ||
| 2877 | - if(parseInt(s_list.rank_switch)==2){ | ||
| 2878 | - var card_price=o[getApp().globalData.userInfo['card_field']]; | ||
| 2879 | - //如果会员有等级价 | ||
| 2880 | - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null | ||
| 2881 | - && getApp().globalData.userInfo['card_field']!="" && card_price>0){ | ||
| 2882 | - newd.goods_price=card_price; | ||
| 2883 | - } | ||
| 2884 | - } | ||
| 2885 | - } | ||
| 2886 | - } | 2874 | + if(th.data.is_normal == 1){ |
| 2875 | + var conf=th.data.bconfig; | ||
| 2876 | + if(conf.switch_list){ | ||
| 2877 | + var s_list=JSON.parse(conf.switch_list); | ||
| 2878 | + //如果后台有开启等级价的功能 | ||
| 2879 | + if(parseInt(s_list.rank_switch)==2){ | ||
| 2880 | + var card_price=o[getApp().globalData.userInfo['card_field']]; | ||
| 2881 | + //如果会员有等级价 | ||
| 2882 | + if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null | ||
| 2883 | + && getApp().globalData.userInfo['card_field']!="" && card_price>0){ | ||
| 2884 | + newd.goods_price=card_price; | ||
| 2885 | + } | ||
| 2886 | + } | ||
| 2887 | + } | ||
| 2888 | + } | ||
| 2887 | 2889 | ||
| 2888 | 2890 | ||
| 2889 | //-----如果是秒杀，团购，积分购,拼团,且不是普通购买----- | 2891 | //-----如果是秒杀，团购，积分购,拼团,且不是普通购买----- |
| @@ -3046,7 +3048,7 @@ Page({ | @@ -3046,7 +3048,7 @@ Page({ | ||
| 3046 | var com_id = e.currentTarget.dataset.com_id; | 3048 | var com_id = e.currentTarget.dataset.com_id; |
| 3047 | var item_id = e.currentTarget.dataset.item_id; | 3049 | var item_id = e.currentTarget.dataset.item_id; |
| 3048 | var app = getApp(), | 3050 | var app = getApp(), |
| 3049 | - th = this; | 3051 | + th = this; |
| 3050 | 3052 | ||
| 3051 | if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) { | 3053 | if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) { |
| 3052 | app.confirmBox("您还未登录"); | 3054 | app.confirmBox("您还未登录"); |
| @@ -3162,14 +3164,14 @@ Page({ | @@ -3162,14 +3164,14 @@ Page({ | ||
| 3162 | var item = this.data.quan_list[index]; | 3164 | var item = this.data.quan_list[index]; |
| 3163 | 3165 | ||
| 3164 | 3166 | ||
| 3165 | - //--先判断会员状态-- | ||
| 3166 | - var user_info = getApp().globalData.userInfo; | ||
| 3167 | - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | ||
| 3168 | - wx.navigateTo({ | ||
| 3169 | - url: '/pages/getphone/getphone', | ||
| 3170 | - }) | ||
| 3171 | - return false; | ||
| 3172 | - } | 3167 | + //--先判断会员状态-- |
| 3168 | + var user_info = getApp().globalData.userInfo; | ||
| 3169 | + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | ||
| 3170 | + wx.navigateTo({ | ||
| 3171 | + url: '/pages/getphone/getphone', | ||
| 3172 | + }) | ||
| 3173 | + return false; | ||
| 3174 | + } | ||
| 3173 | 3175 | ||
| 3174 | 3176 | ||
| 3175 | //如果券还在领取中，不能再点 | 3177 | //如果券还在领取中，不能再点 |
| @@ -3193,7 +3195,7 @@ Page({ | @@ -3193,7 +3195,7 @@ Page({ | ||
| 3193 | 'type': 5 | 3195 | 'type': 5 |
| 3194 | }; | 3196 | }; |
| 3195 | var app = getApp(), | 3197 | var app = getApp(), |
| 3196 | - th = this; | 3198 | + th = this; |
| 3197 | app.request.post("/api/weshop/couponList/saveCouponList", { | 3199 | app.request.post("/api/weshop/couponList/saveCouponList", { |
| 3198 | data: pdata, | 3200 | data: pdata, |
| 3199 | success: function(res) { | 3201 | success: function(res) { |
| @@ -3220,23 +3222,23 @@ Page({ | @@ -3220,23 +3222,23 @@ Page({ | ||
| 3220 | //--定义的保存图片方法，分享团--- | 3222 | //--定义的保存图片方法，分享团--- |
| 3221 | saveImageToPhotosAlbum: function() { | 3223 | saveImageToPhotosAlbum: function() { |
| 3222 | //--先判断会员状态-- | 3224 | //--先判断会员状态-- |
| 3223 | - // var user_info = getApp().globalData.userInfo; | ||
| 3224 | - // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | ||
| 3225 | - // //getApp().my_warnning("请先登录",0,this); | ||
| 3226 | - // wx.navigateTo({ url: '/pages/getphone/getphone', }) | ||
| 3227 | - // return false; | ||
| 3228 | - // } | 3225 | + var user_info = getApp().globalData.userInfo; |
| 3226 | + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | ||
| 3227 | + //getApp().my_warnning("请先登录",0,this); | ||
| 3228 | + wx.navigateTo({ url: '/pages/getphone/getphone', }) | ||
| 3229 | + return false; | ||
| 3230 | + } | ||
| 3229 | 3231 | ||
| 3230 | //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 | 3232 | //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 |
| 3231 | - // var type = this.data.prom_type; | ||
| 3232 | - // if (type == 6) type = 2; | ||
| 3233 | - // if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3; | 3233 | + var type = this.data.prom_type; |
| 3234 | + if (type == 6) type = 2; | ||
| 3235 | + if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3; | ||
| 3234 | 3236 | ||
| 3235 | wx.showLoading({ | 3237 | wx.showLoading({ |
| 3236 | title: '生成中...', | 3238 | title: '生成中...', |
| 3237 | }) | 3239 | }) |
| 3238 | var that = this, | 3240 | var that = this, |
| 3239 | - th = that; | 3241 | + th = that; |
| 3240 | //设置画板显示，才能开始绘图 | 3242 | //设置画板显示，才能开始绘图 |
| 3241 | that.setData({ | 3243 | that.setData({ |
| 3242 | canvasHidden: false | 3244 | canvasHidden: false |
| @@ -3253,9 +3255,9 @@ Page({ | @@ -3253,9 +3255,9 @@ Page({ | ||
| 3253 | 3255 | ||
| 3254 | ///二微码 | 3256 | ///二微码 |
| 3255 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | 3257 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
| 3256 | - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | 3258 | + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; |
| 3257 | 3259 | ||
| 3258 | - console.log('xiaochengxu----->',path3); | 3260 | + console.log(path3); |
| 3259 | 3261 | ||
| 3260 | //读取文件成功则OK-- | 3262 | //读取文件成功则OK-- |
| 3261 | wx.getImageInfo({ | 3263 | wx.getImageInfo({ |
| @@ -3285,164 +3287,155 @@ Page({ | @@ -3285,164 +3287,155 @@ Page({ | ||
| 3285 | //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 | 3287 | //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 |
| 3286 | context.setFillStyle("black"); | 3288 | context.setFillStyle("black"); |
| 3287 | context.setFontSize(21.3 * unit) | 3289 | context.setFontSize(21.3 * unit) |
| 3288 | - th.draw_Text(context, th.data.data.goods_name, 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); | 3290 | + th.draw_Text(context, th.data.data.goods_name, |
| 3291 | + 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); | ||
| 3289 | //------产品的价格------- | 3292 | //------产品的价格------- |
| 3290 | - // context.setFontSize(23 * unit) | ||
| 3291 | - // context.setFillStyle("red") | ||
| 3292 | - // context.fillText("￥", 416 * unit, 185 * unit); | ||
| 3293 | - // context.setFontSize(31 * unit) | ||
| 3294 | - // var pri0 = th.data.data.shop_price; | ||
| 3295 | - // if (th.data.prom_act) | ||
| 3296 | - // pri0 = th.data.prom_act.price; | ||
| 3297 | - | ||
| 3298 | - // pri0 = parseFloat(pri0).toFixed(2); | ||
| 3299 | - // context.fillText(pri0, 438 * unit, 185 * unit); | 3293 | + context.setFontSize(23 * unit) |
| 3294 | + context.setFillStyle("red") | ||
| 3295 | + context.fillText("￥", 416 * unit, 185 * unit); | ||
| 3296 | + context.setFontSize(31 * unit) | ||
| 3297 | + var pri0 = th.data.data.shop_price; | ||
| 3298 | + if (th.data.prom_act) | ||
| 3299 | + pri0 = th.data.prom_act.price; | ||
| 3300 | + | ||
| 3301 | + pri0 = parseFloat(pri0).toFixed(2); | ||
| 3302 | + context.fillText(pri0, 438 * unit, 185 * unit); | ||
| 3300 | //---市场价划掉--- | 3303 | //---市场价划掉--- |
| 3301 | - // context.setFillStyle("gray") | ||
| 3302 | - // context.setFontSize(22 * unit) | ||
| 3303 | - // context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit); | ||
| 3304 | - // context.setStrokeStyle('gray') | ||
| 3305 | - // context.setLineWidth(1 * unit) | ||
| 3306 | - // context.moveTo(426 * unit, 206 * unit) | ||
| 3307 | - // context.lineTo(510 * unit, 206 * unit) | ||
| 3308 | - // context.stroke(); | 3304 | + context.setFillStyle("gray") |
| 3305 | + context.setFontSize(22 * unit) | ||
| 3306 | + context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit); | ||
| 3307 | + context.setStrokeStyle('gray') | ||
| 3308 | + context.setLineWidth(1 * unit) | ||
| 3309 | + context.moveTo(426 * unit, 206 * unit) | ||
| 3310 | + context.lineTo(510 * unit, 206 * unit) | ||
| 3311 | + context.stroke(); | ||
| 3309 | //---中间大图--- | 3312 | //---中间大图--- |
| 3310 | context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit); | 3313 | context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit); |
| 3311 | - | ||
| 3312 | - //---文字--- | ||
| 3313 | - context.setFontSize(22 * unit) | ||
| 3314 | - context.setFillStyle("black") | ||
| 3315 | - context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit); | ||
| 3316 | - context.fillText("长按识别小程序码", 40 * unit, 826 * unit); | ||
| 3317 | - //---二维吗图--- | ||
| 3318 | - context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); | ||
| 3319 | - | ||
| 3320 | - | ||
| 3321 | //-------大图后面就不一样了----------- | 3314 | //-------大图后面就不一样了----------- |
| 3322 | - // switch (type) { | ||
| 3323 | - // case 0: //普通商品的展示 | 3315 | + switch (type) { |
| 3316 | + case 0: //普通商品的展示 | ||
| 3324 | //中间的几个字 | 3317 | //中间的几个字 |
| 3325 | - // var g_path = "../../../images/share/s_gou.png"; | ||
| 3326 | - // context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); | ||
| 3327 | - // context.setFillStyle("red") | ||
| 3328 | - // context.setFontSize(18 * unit) | ||
| 3329 | - // context.fillText("正品保证", 84 * unit, 690 * unit); | ||
| 3330 | - | ||
| 3331 | - // context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); | ||
| 3332 | - // context.setFillStyle("red") | ||
| 3333 | - // context.setFontSize(18 * unit) | ||
| 3334 | - // context.fillText("纯实体店", 246 * unit, 690 * unit); | ||
| 3335 | - | ||
| 3336 | - // context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); | ||
| 3337 | - // context.setFillStyle("red") | ||
| 3338 | - // context.setFontSize(18 * unit) | ||
| 3339 | - // context.fillText("官方验证", 420 * unit, 690 * unit); | 3318 | + var g_path = "../../../images/share/s_gou.png"; |
| 3319 | + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); | ||
| 3320 | + context.setFillStyle("red") | ||
| 3321 | + context.setFontSize(18 * unit) | ||
| 3322 | + context.fillText("正品保证", 84 * unit, 690 * unit); | ||
| 3323 | + | ||
| 3324 | + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); | ||
| 3325 | + context.setFillStyle("red") | ||
| 3326 | + context.setFontSize(18 * unit) | ||
| 3327 | + context.fillText("纯实体店", 246 * unit, 690 * unit); | ||
| 3328 | + | ||
| 3329 | + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); | ||
| 3330 | + context.setFillStyle("red") | ||
| 3331 | + context.setFontSize(18 * unit) | ||
| 3332 | + context.fillText("官方验证", 420 * unit, 690 * unit); | ||
| 3340 | //---画线--- | 3333 | //---画线--- |
| 3341 | - // context.setLineWidth(1 * unit) | ||
| 3342 | - // context.moveTo(32 * unit, 710 * unit) | ||
| 3343 | - // context.lineTo(520 * unit, 710 * unit) | ||
| 3344 | - // context.stroke(); | 3334 | + context.setLineWidth(1 * unit) |
| 3335 | + context.moveTo(32 * unit, 710 * unit) | ||
| 3336 | + context.lineTo(520 * unit, 710 * unit) | ||
| 3337 | + context.stroke(); | ||
| 3345 | //---文字--- | 3338 | //---文字--- |
| 3346 | - // context.setFontSize(22 * unit) | ||
| 3347 | - // context.setFillStyle("black") | ||
| 3348 | - // context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit); | ||
| 3349 | - // context.fillText("长按识别小程序码", 40 * unit, 826 * unit); | ||
| 3350 | - // //---二维吗图--- | ||
| 3351 | - // context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); | ||
| 3352 | - // break; | ||
| 3353 | - // case 1: //秒杀商品的展示 | ||
| 3354 | - // //---画线--- | ||
| 3355 | - // context.setLineWidth(1 * unit) | ||
| 3356 | - // context.moveTo(32 * unit, 670 * unit) | ||
| 3357 | - // context.lineTo(520 * unit, 670 * unit) | ||
| 3358 | - // context.stroke(); | ||
| 3359 | - | ||
| 3360 | - // //画秒杀的图片 | ||
| 3361 | - // var miaos_path = '../../../images/share/miao_share.png'; | ||
| 3362 | - // context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); | ||
| 3363 | - | ||
| 3364 | - // //---文字--- | ||
| 3365 | - // context.setFontSize(22 * unit) | ||
| 3366 | - // context.setFillStyle("black") | ||
| 3367 | - // context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit); | ||
| 3368 | - // context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit); | ||
| 3369 | - // //---二维吗图--- | ||
| 3370 | - // context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); | ||
| 3371 | - // break; | ||
| 3372 | - | ||
| 3373 | - // case 2: //会员团和商家团的展示 | ||
| 3374 | - // //---画线--- | ||
| 3375 | - // context.setLineWidth(1 * unit) | ||
| 3376 | - // context.moveTo(32 * unit, 670 * unit) | ||
| 3377 | - // context.lineTo(520 * unit, 670 * unit) | ||
| 3378 | - // context.stroke(); | ||
| 3379 | - // //---文字--- | ||
| 3380 | - // context.setFontSize(22 * unit) | ||
| 3381 | - // context.font = 'normal bold'; | ||
| 3382 | - // context.setFillStyle("black") | ||
| 3383 | - // context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); | ||
| 3384 | - | ||
| 3385 | - // //绘制成团图片 | ||
| 3386 | - // var ct_img = "../../../images/share/ct_num.png"; | ||
| 3387 | - // context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); | ||
| 3388 | - // var ct_num = th.data.prom_act.ct_num; | ||
| 3389 | - // context.setFontSize(14 * unit) | ||
| 3390 | - // context.font = 'normal'; | ||
| 3391 | - // context.setFillStyle("red") | ||
| 3392 | - // if (ct_num < 10) { | ||
| 3393 | - // context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit); | ||
| 3394 | - // } else { | ||
| 3395 | - // context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit); | ||
| 3396 | - // } | ||
| 3397 | - // context.setFontSize(22 * unit) | ||
| 3398 | - // context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit); | ||
| 3399 | - // context.setFillStyle("gray") | ||
| 3400 | - // context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit); | ||
| 3401 | - // context.setFillStyle("black") | ||
| 3402 | - // context.font = 'normal bold 18px sans-serif'; | ||
| 3403 | - // context.setFontSize(21.3 * unit) | ||
| 3404 | - // context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit); | ||
| 3405 | - // //---二维吗图--- | ||
| 3406 | - // context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); | ||
| 3407 | - // break | ||
| 3408 | - // case 3: //阶梯团的展示 | ||
| 3409 | - // //---画线--- | ||
| 3410 | - // context.setLineWidth(1 * unit) | ||
| 3411 | - // context.moveTo(32 * unit, 670 * unit) | ||
| 3412 | - // context.lineTo(520 * unit, 670 * unit) | ||
| 3413 | - // context.stroke(); | ||
| 3414 | - // //---文字--- | ||
| 3415 | - // context.setFontSize(22 * unit) | ||
| 3416 | - // context.font = 'normal bold'; | ||
| 3417 | - // context.setFillStyle("black") | ||
| 3418 | - // context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); | ||
| 3419 | - // //---绘制中间阶梯的价格--- | ||
| 3420 | - // var list = th.data.prom_act.ct_rylist; | ||
| 3421 | - // for (var i = 0; i < list.length; i++) { | ||
| 3422 | - // var item = list[i]; | ||
| 3423 | - // var wi = i * 90 * unit; | ||
| 3424 | - // context.font = 'normal'; | ||
| 3425 | - // context.setFontSize(16 * unit) | ||
| 3426 | - // context.setFillStyle("red") | ||
| 3427 | - // context.fillText("￥", 40 * unit + wi, 756 * unit); | ||
| 3428 | - // context.setFontSize(22 * unit) | ||
| 3429 | - // var pri = parseFloat(item.price).toFixed(2); | ||
| 3430 | - // context.fillText(pri, 56 * unit + wi, 756 * unit); | ||
| 3431 | - // context.setFillStyle("gray") | ||
| 3432 | - // context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit); | ||
| 3433 | - // } | ||
| 3434 | - // //----------------下面部分---------------- | ||
| 3435 | - // context.setFillStyle("gray") | ||
| 3436 | - // context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit); | ||
| 3437 | - // context.setFillStyle("black") | ||
| 3438 | - // context.font = 'normal bold 18px sans-serif'; | ||
| 3439 | - // context.setFontSize(22 * unit) | ||
| 3440 | - // context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); | ||
| 3441 | - // //---二维吗图--- | ||
| 3442 | - // context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); | ||
| 3443 | - | ||
| 3444 | - // break | ||
| 3445 | - // } | 3339 | + context.setFontSize(22 * unit) |
| 3340 | + context.setFillStyle("black") | ||
| 3341 | + context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit); | ||
| 3342 | + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit); | ||
| 3343 | + //---二维吗图--- | ||
| 3344 | + context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); | ||
| 3345 | + break; | ||
| 3346 | + case 1: //秒杀商品的展示 | ||
| 3347 | + //---画线--- | ||
| 3348 | + context.setLineWidth(1 * unit) | ||
| 3349 | + context.moveTo(32 * unit, 670 * unit) | ||
| 3350 | + context.lineTo(520 * unit, 670 * unit) | ||
| 3351 | + context.stroke(); | ||
| 3352 | + | ||
| 3353 | + //画秒杀的图片 | ||
| 3354 | + var miaos_path = '../../../images/share/miao_share.png'; | ||
| 3355 | + context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); | ||
| 3356 | + | ||
| 3357 | + //---文字--- | ||
| 3358 | + context.setFontSize(22 * unit) | ||
| 3359 | + context.setFillStyle("black") | ||
| 3360 | + context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit); | ||
| 3361 | + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit); | ||
| 3362 | + //---二维吗图--- | ||
| 3363 | + context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); | ||
| 3364 | + break; | ||
| 3365 | + | ||
| 3366 | + case 2: //会员团和商家团的展示 | ||
| 3367 | + //---画线--- | ||
| 3368 | + context.setLineWidth(1 * unit) | ||
| 3369 | + context.moveTo(32 * unit, 670 * unit) | ||
| 3370 | + context.lineTo(520 * unit, 670 * unit) | ||
| 3371 | + context.stroke(); | ||
| 3372 | + //---文字--- | ||
| 3373 | + context.setFontSize(22 * unit) | ||
| 3374 | + context.font = 'normal bold'; | ||
| 3375 | + context.setFillStyle("black") | ||
| 3376 | + context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); | ||
| 3377 | + | ||
| 3378 | + //绘制成团图片 | ||
| 3379 | + var ct_img = "../../../images/share/ct_num.png"; | ||
| 3380 | + context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); | ||
| 3381 | + var ct_num = th.data.prom_act.ct_num; | ||
| 3382 | + context.setFontSize(14 * unit) | ||
| 3383 | + context.font = 'normal'; | ||
| 3384 | + context.setFillStyle("red") | ||
| 3385 | + if (ct_num < 10) { | ||
| 3386 | + context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit); | ||
| 3387 | + } else { | ||
| 3388 | + context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit); | ||
| 3389 | + } | ||
| 3390 | + context.setFontSize(22 * unit) | ||
| 3391 | + context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit); | ||
| 3392 | + context.setFillStyle("gray") | ||
| 3393 | + context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit); | ||
| 3394 | + context.setFillStyle("black") | ||
| 3395 | + context.font = 'normal bold 18px sans-serif'; | ||
| 3396 | + context.setFontSize(21.3 * unit) | ||
| 3397 | + context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit); | ||
| 3398 | + //---二维吗图--- | ||
| 3399 | + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); | ||
| 3400 | + break | ||
| 3401 | + case 3: //阶梯团的展示 | ||
| 3402 | + //---画线--- | ||
| 3403 | + context.setLineWidth(1 * unit) | ||
| 3404 | + context.moveTo(32 * unit, 670 * unit) | ||
| 3405 | + context.lineTo(520 * unit, 670 * unit) | ||
| 3406 | + context.stroke(); | ||
| 3407 | + //---文字--- | ||
| 3408 | + context.setFontSize(22 * unit) | ||
| 3409 | + context.font = 'normal bold'; | ||
| 3410 | + context.setFillStyle("black") | ||
| 3411 | + context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); | ||
| 3412 | + //---绘制中间阶梯的价格--- | ||
| 3413 | + var list = th.data.prom_act.ct_rylist; | ||
| 3414 | + for (var i = 0; i < list.length; i++) { | ||
| 3415 | + var item = list[i]; | ||
| 3416 | + var wi = i * 90 * unit; | ||
| 3417 | + context.font = 'normal'; | ||
| 3418 | + context.setFontSize(16 * unit) | ||
| 3419 | + context.setFillStyle("red") | ||
| 3420 | + context.fillText("￥", 40 * unit + wi, 756 * unit); | ||
| 3421 | + context.setFontSize(22 * unit) | ||
| 3422 | + var pri = parseFloat(item.price).toFixed(2); | ||
| 3423 | + context.fillText(pri, 56 * unit + wi, 756 * unit); | ||
| 3424 | + context.setFillStyle("gray") | ||
| 3425 | + context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit); | ||
| 3426 | + } | ||
| 3427 | + //----------------下面部分---------------- | ||
| 3428 | + context.setFillStyle("gray") | ||
| 3429 | + context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit); | ||
| 3430 | + context.setFillStyle("black") | ||
| 3431 | + context.font = 'normal bold 18px sans-serif'; | ||
| 3432 | + context.setFontSize(22 * unit) | ||
| 3433 | + context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); | ||
| 3434 | + //---二维吗图--- | ||
| 3435 | + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); | ||
| 3436 | + | ||
| 3437 | + break | ||
| 3438 | + } | ||
| 3446 | 3439 | ||
| 3447 | //---绘制圆形要放在最后---- | 3440 | //---绘制圆形要放在最后---- |
| 3448 | context.save(); | 3441 | context.save(); |
| @@ -3682,22 +3675,22 @@ Page({ | @@ -3682,22 +3675,22 @@ Page({ | ||
| 3682 | var th = this; | 3675 | var th = this; |
| 3683 | var ind=ee.currentTarget.dataset.ind; | 3676 | var ind=ee.currentTarget.dataset.ind; |
| 3684 | var bconfig = th.data.bconfig; | 3677 | var bconfig = th.data.bconfig; |
| 3685 | - | ||
| 3686 | - if(!th.data.only_pk && !th.data.def_pickpu_list){ | ||
| 3687 | - getApp().confirmBox("门店库存不足", null, 25000, !1); | ||
| 3688 | - return false; | ||
| 3689 | - } | ||
| 3690 | - | ||
| 3691 | - if(th.data.only_pk && !th.data.only_pk.length){ | ||
| 3692 | - getApp().confirmBox("门店库存不足", null, 25000, !1); | ||
| 3693 | - return false; | ||
| 3694 | - } | ||
| 3695 | - if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){ | ||
| 3696 | - getApp().confirmBox("门店库存不足", null, 25000, !1); | ||
| 3697 | - return false; | ||
| 3698 | - } | ||
| 3699 | - | ||
| 3700 | - | 3678 | + |
| 3679 | + if(!th.data.only_pk && !th.data.def_pickpu_list){ | ||
| 3680 | + getApp().confirmBox("门店库存不足", null, 25000, !1); | ||
| 3681 | + return false; | ||
| 3682 | + } | ||
| 3683 | + | ||
| 3684 | + if(th.data.only_pk && !th.data.only_pk.length){ | ||
| 3685 | + getApp().confirmBox("门店库存不足", null, 25000, !1); | ||
| 3686 | + return false; | ||
| 3687 | + } | ||
| 3688 | + if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){ | ||
| 3689 | + getApp().confirmBox("门店库存不足", null, 25000, !1); | ||
| 3690 | + return false; | ||
| 3691 | + } | ||
| 3692 | + | ||
| 3693 | + | ||
| 3701 | if (bconfig.is_sort_storage) { | 3694 | if (bconfig.is_sort_storage) { |
| 3702 | wx.getLocation({ | 3695 | wx.getLocation({ |
| 3703 | type: 'wgs84', | 3696 | type: 'wgs84', |
| @@ -3714,7 +3707,7 @@ Page({ | @@ -3714,7 +3707,7 @@ Page({ | ||
| 3714 | }, | 3707 | }, |
| 3715 | fail: function(res) { | 3708 | fail: function(res) { |
| 3716 | //th.onShow(); | 3709 | //th.onShow(); |
| 3717 | - th.data.is_get_local_ok = 1; | 3710 | + th.data.is_get_local_ok = 1; |
| 3718 | th.get_sto(); | 3711 | th.get_sto(); |
| 3719 | if (res.errCode == 2) { | 3712 | if (res.errCode == 2) { |
| 3720 | th.setData({ | 3713 | th.setData({ |
| @@ -3735,64 +3728,64 @@ Page({ | @@ -3735,64 +3728,64 @@ Page({ | ||
| 3735 | th.data.is_get_local_ok = 1; | 3728 | th.data.is_get_local_ok = 1; |
| 3736 | th.get_sto(); | 3729 | th.get_sto(); |
| 3737 | } | 3730 | } |
| 3738 | - | ||
| 3739 | - if(ind!=undefined && ind!=null ){ | ||
| 3740 | - this.setData({ | ||
| 3741 | - open_ind_store: ind, | ||
| 3742 | - store: 1, | ||
| 3743 | - openSpecModal: !1, | ||
| 3744 | - openSpecModal_pt: !1 | ||
| 3745 | - }) | ||
| 3746 | - }else{ | ||
| 3747 | - this.setData({ | ||
| 3748 | - store: 1, | ||
| 3749 | - openSpecModal: !1, | ||
| 3750 | - openSpecModal_pt: !1 | ||
| 3751 | - }) | ||
| 3752 | - } | 3731 | + |
| 3732 | + if(ind!=undefined && ind!=null ){ | ||
| 3733 | + this.setData({ | ||
| 3734 | + open_ind_store: ind, | ||
| 3735 | + store: 1, | ||
| 3736 | + openSpecModal: !1, | ||
| 3737 | + openSpecModal_pt: !1 | ||
| 3738 | + }) | ||
| 3739 | + }else{ | ||
| 3740 | + this.setData({ | ||
| 3741 | + store: 1, | ||
| 3742 | + openSpecModal: !1, | ||
| 3743 | + openSpecModal_pt: !1 | ||
| 3744 | + }) | ||
| 3745 | + } | ||
| 3753 | }, | 3746 | }, |
| 3754 | //关闭选择门店 | 3747 | //关闭选择门店 |
| 3755 | close_popup: function(e) { | 3748 | close_popup: function(e) { |
| 3756 | - var th=this; | 3749 | + var th=this; |
| 3757 | this.setData({ | 3750 | this.setData({ |
| 3758 | store: 0, | 3751 | store: 0, |
| 3759 | choice_sort_store: 0, | 3752 | choice_sort_store: 0, |
| 3760 | sort_store: 0, | 3753 | sort_store: 0, |
| 3761 | - fir_pick_index:0, | ||
| 3762 | - sec_pick_index:0 | 3754 | + fir_pick_index:0, |
| 3755 | + sec_pick_index:0 | ||
| 3763 | }) | 3756 | }) |
| 3764 | - | ||
| 3765 | - var openindstore=this.data.open_ind_store; | ||
| 3766 | - if (openindstore == 1) { | ||
| 3767 | - th.setData({ | ||
| 3768 | - openSpecModal: !0, | ||
| 3769 | - openSpecModal_ind: openindstore, | ||
| 3770 | - }); | ||
| 3771 | - } else if (openindstore == 2) { | ||
| 3772 | - th.setData({ | ||
| 3773 | - openSpecModal: !0, | ||
| 3774 | - openSpecModal_ind: openindstore, | ||
| 3775 | - }); | ||
| 3776 | - } | ||
| 3777 | - else if (openindstore == 4) { //4就是拼团 | ||
| 3778 | - th.setData({ | ||
| 3779 | - openSpecModal_pt: 1, //打开拼团购买界面 | ||
| 3780 | - store: 0, //关闭门店 | ||
| 3781 | - choice_sort_store: 0, //关闭门店2级 | ||
| 3782 | - sort_store: 0, //关闭门店2级 | ||
| 3783 | - }); | ||
| 3784 | - } | ||
| 3785 | - else { | ||
| 3786 | - th.setData({ | ||
| 3787 | - store: 0, | ||
| 3788 | - choice_sort_store: 0, | ||
| 3789 | - sort_store: 0 | ||
| 3790 | - }) | ||
| 3791 | - } | ||
| 3792 | - | ||
| 3793 | - | 3757 | + |
| 3758 | + var openindstore=this.data.open_ind_store; | ||
| 3759 | + if (openindstore == 1) { | ||
| 3760 | + th.setData({ | ||
| 3761 | + openSpecModal: !0, | ||
| 3762 | + openSpecModal_ind: openindstore, | ||
| 3763 | + }); | ||
| 3764 | + } else if (openindstore == 2) { | ||
| 3765 | + th.setData({ | ||
| 3766 | + openSpecModal: !0, | ||
| 3767 | + openSpecModal_ind: openindstore, | ||
| 3768 | + }); | ||
| 3769 | + } | ||
| 3770 | + else if (openindstore == 4) { //4就是拼团 | ||
| 3771 | + th.setData({ | ||
| 3772 | + openSpecModal_pt: 1, //打开拼团购买界面 | ||
| 3773 | + store: 0, //关闭门店 | ||
| 3774 | + choice_sort_store: 0, //关闭门店2级 | ||
| 3775 | + sort_store: 0, //关闭门店2级 | ||
| 3776 | + }); | ||
| 3777 | + } | ||
| 3778 | + else { | ||
| 3779 | + th.setData({ | ||
| 3780 | + store: 0, | ||
| 3781 | + choice_sort_store: 0, | ||
| 3782 | + sort_store: 0 | ||
| 3783 | + }) | ||
| 3784 | + } | ||
| 3785 | + | ||
| 3786 | + | ||
| 3794 | }, | 3787 | }, |
| 3795 | - | 3788 | + |
| 3796 | //选择更多门店 | 3789 | //选择更多门店 |
| 3797 | more_store: function() { | 3790 | more_store: function() { |
| 3798 | this.setData({ | 3791 | this.setData({ |
| @@ -3822,61 +3815,61 @@ Page({ | @@ -3822,61 +3815,61 @@ Page({ | ||
| 3822 | sec_pick_index: 0 | 3815 | sec_pick_index: 0 |
| 3823 | }); | 3816 | }); |
| 3824 | }, | 3817 | }, |
| 3825 | - | 3818 | + |
| 3826 | choose_for_store_fir: function(e) { | 3819 | choose_for_store_fir: function(e) { |
| 3827 | var index_c = e.currentTarget.dataset.ind; | 3820 | var index_c = e.currentTarget.dataset.ind; |
| 3828 | - var th=this; | 3821 | + var th=this; |
| 3829 | th.setData({ | 3822 | th.setData({ |
| 3830 | - fir_pick_index: index_c | 3823 | + fir_pick_index: index_c |
| 3831 | }) | 3824 | }) |
| 3832 | 3825 | ||
| 3833 | }, | 3826 | }, |
| 3834 | - | 3827 | + |
| 3835 | //如果开启线下库存，已经急速库存才会使用 | 3828 | //如果开启线下库存，已经急速库存才会使用 |
| 3836 | async check_the_pick(item,func){ | 3829 | async check_the_pick(item,func){ |
| 3837 | - var th=this; | ||
| 3838 | - var goodsinfo=th.data.sele_g; | ||
| 3839 | - var erpwareid=goodsinfo.erpwareid; | ||
| 3840 | - var plist=null; | ||
| 3841 | - var lock=0; | ||
| 3842 | - | ||
| 3843 | - //---如果是活动的时候--- | ||
| 3844 | - if(th.data.prom_type==1 || th.data.prom_type==6){ | ||
| 3845 | - func(); return false; | ||
| 3846 | - } | ||
| 3847 | - | ||
| 3848 | - if(this.data.sales_rules!=2){ | ||
| 3849 | - func(); | ||
| 3850 | - }else{ | ||
| 3851 | - | ||
| 3852 | - //先读取门店的lock | ||
| 3853 | - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 3854 | - data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000} | ||
| 3855 | - }).then(res=>{ | ||
| 3856 | - if(res.data.code==0 && res.data.data.total>0){ | ||
| 3857 | - for(var i in res.data.data.pageData ) | ||
| 3858 | - lock+=res.data.data.pageData[i].outQty; | ||
| 3859 | - } | ||
| 3860 | - }) | ||
| 3861 | - //读取线下的门店库存 | ||
| 3862 | - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 3863 | - data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} | ||
| 3864 | - }).then(res=>{ | ||
| 3865 | - if(res.data.code==0 && res.data.data.total>0){ | ||
| 3866 | - plist=res.data.data.pageData[0]; | ||
| 3867 | - } | ||
| 3868 | - }) | ||
| 3869 | - | ||
| 3870 | - if(plist && plist.CanOutQty-lock>0){ | ||
| 3871 | - item.CanOutQty=plist.CanOutQty-lock; | ||
| 3872 | - func(); | ||
| 3873 | - return false; | ||
| 3874 | - } | ||
| 3875 | - getApp().my_warnning(item.pickup_name+"库存不足！", 0, th); | ||
| 3876 | - | ||
| 3877 | - } | 3830 | + var th=this; |
| 3831 | + var goodsinfo=th.data.sele_g; | ||
| 3832 | + var erpwareid=goodsinfo.erpwareid; | ||
| 3833 | + var plist=null; | ||
| 3834 | + var lock=0; | ||
| 3835 | + | ||
| 3836 | + //---如果是活动的时候--- | ||
| 3837 | + if(th.data.prom_type==1 || th.data.prom_type==6){ | ||
| 3838 | + func(); return false; | ||
| 3839 | + } | ||
| 3840 | + | ||
| 3841 | + if(this.data.sales_rules!=2){ | ||
| 3842 | + func(); | ||
| 3843 | + }else{ | ||
| 3844 | + | ||
| 3845 | + //先读取门店的lock | ||
| 3846 | + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 3847 | + data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000} | ||
| 3848 | + }).then(res=>{ | ||
| 3849 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 3850 | + for(var i in res.data.data.pageData ) | ||
| 3851 | + lock+=res.data.data.pageData[i].outQty; | ||
| 3852 | + } | ||
| 3853 | + }) | ||
| 3854 | + //读取线下的门店库存 | ||
| 3855 | + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 3856 | + data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} | ||
| 3857 | + }).then(res=>{ | ||
| 3858 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 3859 | + plist=res.data.data.pageData[0]; | ||
| 3860 | + } | ||
| 3861 | + }) | ||
| 3862 | + | ||
| 3863 | + if(plist && plist.CanOutQty-lock>0){ | ||
| 3864 | + item.CanOutQty=plist.CanOutQty-lock; | ||
| 3865 | + func(); | ||
| 3866 | + return false; | ||
| 3867 | + } | ||
| 3868 | + getApp().my_warnning(item.pickup_name+"库存不足！", 0, th); | ||
| 3869 | + | ||
| 3870 | + } | ||
| 3878 | }, | 3871 | }, |
| 3879 | - | 3872 | + |
| 3880 | 3873 | ||
| 3881 | //确定def_pick为选择的门店 | 3874 | //确定def_pick为选择的门店 |
| 3882 | sure_pick: function(e) { | 3875 | sure_pick: function(e) { |
| @@ -3896,56 +3889,56 @@ Page({ | @@ -3896,56 +3889,56 @@ Page({ | ||
| 3896 | var index = th.data.sec_pick_index; | 3889 | var index = th.data.sec_pick_index; |
| 3897 | item = th.data.sec_sto.s_arr[index]; | 3890 | item = th.data.sec_sto.s_arr[index]; |
| 3898 | } | 3891 | } |
| 3899 | - | ||
| 3900 | - //--回调函数的用法-- | ||
| 3901 | - th.check_the_pick(item,function(){ | ||
| 3902 | - th.setData({ | ||
| 3903 | - def_pick_store: item, | ||
| 3904 | - sto_sele_name: item.pickup_name, | ||
| 3905 | - sto_sele_id: item.pickup_id, | ||
| 3906 | - sto_sele_distr: item.distr_type, | ||
| 3907 | - store: 0, | ||
| 3908 | - choice_sort_store: 0, | ||
| 3909 | - fir_pick_index: 0 | ||
| 3910 | - }); | ||
| 3911 | - | ||
| 3912 | - if (openindstore == 1) { | ||
| 3913 | - th.setData({ | ||
| 3914 | - openSpecModal: !0, | ||
| 3915 | - openSpecModal_ind: openindstore, | ||
| 3916 | - }); | ||
| 3917 | - } else if (openindstore == 2) { | ||
| 3918 | - th.setData({ | ||
| 3919 | - openSpecModal: !0, | ||
| 3920 | - openSpecModal_ind: openindstore, | ||
| 3921 | - }); | ||
| 3922 | - } | ||
| 3923 | - else if (openindstore == 4) { //4就是拼团 | ||
| 3924 | - th.setData({ | ||
| 3925 | - openSpecModal_pt: 1, //打开拼团购买界面 | ||
| 3926 | - store: 0, //关闭门店 | ||
| 3927 | - choice_sort_store: 0, //关闭门店2级 | ||
| 3928 | - sort_store: 0, //关闭门店2级 | ||
| 3929 | - }); | ||
| 3930 | - } | ||
| 3931 | - else { | ||
| 3932 | - th.setData({ | ||
| 3933 | - store: 0, | ||
| 3934 | - choice_sort_store: 0, | ||
| 3935 | - sort_store: 0 | ||
| 3936 | - }) | ||
| 3937 | - } | ||
| 3938 | - }) | 3892 | + |
| 3893 | + //--回调函数的用法-- | ||
| 3894 | + th.check_the_pick(item,function(){ | ||
| 3895 | + th.setData({ | ||
| 3896 | + def_pick_store: item, | ||
| 3897 | + sto_sele_name: item.pickup_name, | ||
| 3898 | + sto_sele_id: item.pickup_id, | ||
| 3899 | + sto_sele_distr: item.distr_type, | ||
| 3900 | + store: 0, | ||
| 3901 | + choice_sort_store: 0, | ||
| 3902 | + fir_pick_index: 0 | ||
| 3903 | + }); | ||
| 3904 | + | ||
| 3905 | + if (openindstore == 1) { | ||
| 3906 | + th.setData({ | ||
| 3907 | + openSpecModal: !0, | ||
| 3908 | + openSpecModal_ind: openindstore, | ||
| 3909 | + }); | ||
| 3910 | + } else if (openindstore == 2) { | ||
| 3911 | + th.setData({ | ||
| 3912 | + openSpecModal: !0, | ||
| 3913 | + openSpecModal_ind: openindstore, | ||
| 3914 | + }); | ||
| 3915 | + } | ||
| 3916 | + else if (openindstore == 4) { //4就是拼团 | ||
| 3917 | + th.setData({ | ||
| 3918 | + openSpecModal_pt: 1, //打开拼团购买界面 | ||
| 3919 | + store: 0, //关闭门店 | ||
| 3920 | + choice_sort_store: 0, //关闭门店2级 | ||
| 3921 | + sort_store: 0, //关闭门店2级 | ||
| 3922 | + }); | ||
| 3923 | + } | ||
| 3924 | + else { | ||
| 3925 | + th.setData({ | ||
| 3926 | + store: 0, | ||
| 3927 | + choice_sort_store: 0, | ||
| 3928 | + sort_store: 0 | ||
| 3929 | + }) | ||
| 3930 | + } | ||
| 3931 | + }) | ||
| 3939 | }, | 3932 | }, |
| 3940 | //---点击二级之后的选择--- | 3933 | //---点击二级之后的选择--- |
| 3941 | choose_for_store: function(e) { | 3934 | choose_for_store: function(e) { |
| 3942 | var index_c = e.currentTarget.dataset.ind; | 3935 | var index_c = e.currentTarget.dataset.ind; |
| 3943 | - var th=this; | ||
| 3944 | - th.setData({ | ||
| 3945 | - sec_pick_index: index_c, | ||
| 3946 | - fir_pick_index: index_c | ||
| 3947 | - }) | ||
| 3948 | - | 3936 | + var th=this; |
| 3937 | + th.setData({ | ||
| 3938 | + sec_pick_index: index_c, | ||
| 3939 | + fir_pick_index: index_c | ||
| 3940 | + }) | ||
| 3941 | + | ||
| 3949 | }, | 3942 | }, |
| 3950 | //把选择的门店设置成默认的门店def_pick | 3943 | //把选择的门店设置成默认的门店def_pick |
| 3951 | set_def_pick: function(e) { | 3944 | set_def_pick: function(e) { |
| @@ -3962,76 +3955,76 @@ Page({ | @@ -3962,76 +3955,76 @@ Page({ | ||
| 3962 | var index = th.data.sec_pick_index; | 3955 | var index = th.data.sec_pick_index; |
| 3963 | item = th.data.sec_sto.s_arr[index]; | 3956 | item = th.data.sec_sto.s_arr[index]; |
| 3964 | } | 3957 | } |
| 3965 | - | ||
| 3966 | - //先设置之前,要判断是不是有库存 | ||
| 3967 | - th.check_the_pick(item,function(){ | ||
| 3968 | - var store_id = o.stoid; | ||
| 3969 | - var user_id = getApp().globalData.user_id; | ||
| 3970 | - var def_pickup_id = item.pickup_id; | ||
| 3971 | - | ||
| 3972 | - getApp().request.put('/api/weshop/users/update', { | ||
| 3973 | - data: { | ||
| 3974 | - user_id, | ||
| 3975 | - def_pickup_id | ||
| 3976 | - }, | ||
| 3977 | - success: function(res) { | ||
| 3978 | - if (res.data.code == 0) { | ||
| 3979 | - if (th.data.choice_sort_store == 0) th.setData({ | ||
| 3980 | - fir_pick_index: 0 | ||
| 3981 | - }); | ||
| 3982 | - getApp().globalData.pk_store = item; | ||
| 3983 | - } else { | ||
| 3984 | - //s.showWarning("设置默认门店地址失败", null, 500, !1); | ||
| 3985 | - getApp().my_warnning("设置默认门店地址失败",0,th) | ||
| 3986 | - } | ||
| 3987 | - | ||
| 3988 | - } | ||
| 3989 | - }); | ||
| 3990 | - | ||
| 3991 | - th.setData({ | ||
| 3992 | - def_pick_store: item, | ||
| 3993 | - sto_sele_name: item.pickup_name, | ||
| 3994 | - sto_sele_id: item.pickup_id, | ||
| 3995 | - sto_sele_distr: item.distr_type, | ||
| 3996 | - store: 0, | ||
| 3997 | - choice_sort_store: 0 | ||
| 3998 | - }); | ||
| 3999 | - | ||
| 4000 | - var openindstore = th.data.open_ind_store; | ||
| 4001 | - if (openindstore == 1) { | ||
| 4002 | - th.setData({ | ||
| 4003 | - openSpecModal: !0, | ||
| 4004 | - openSpecModal_ind: openindstore, | ||
| 4005 | - store: 0, | ||
| 4006 | - choice_sort_store: 0, | ||
| 4007 | - sort_store: 0, | ||
| 4008 | - }); | ||
| 4009 | - } else if (openindstore == 2) { | ||
| 4010 | - th.setData({ | ||
| 4011 | - openSpecModal: !0, | ||
| 4012 | - openSpecModal_ind: openindstore, | ||
| 4013 | - store: 0, | ||
| 4014 | - choice_sort_store: 0, | ||
| 4015 | - sort_store: 0, | ||
| 4016 | - }); | ||
| 4017 | - } | ||
| 4018 | - else if (openindstore == 4) { //4就是拼团 | ||
| 4019 | - th.setData({ | ||
| 4020 | - openSpecModal_pt: 1, //打开拼团购买界面 | ||
| 4021 | - store: 0, //关闭门店 | ||
| 4022 | - choice_sort_store: 0, //关闭门店2级 | ||
| 4023 | - sort_store: 0, //关闭门店2级 | ||
| 4024 | - }); | ||
| 4025 | - } | ||
| 4026 | - | ||
| 4027 | - else { | ||
| 4028 | - th.setData({ | ||
| 4029 | - store: 0, | ||
| 4030 | - choice_sort_store: 0, | ||
| 4031 | - sort_store: 0, | ||
| 4032 | - }) | ||
| 4033 | - } | ||
| 4034 | - }) | 3958 | + |
| 3959 | + //先设置之前,要判断是不是有库存 | ||
| 3960 | + th.check_the_pick(item,function(){ | ||
| 3961 | + var store_id = o.stoid; | ||
| 3962 | + var user_id = getApp().globalData.user_id; | ||
| 3963 | + var def_pickup_id = item.pickup_id; | ||
| 3964 | + | ||
| 3965 | + getApp().request.put('/api/weshop/users/update', { | ||
| 3966 | + data: { | ||
| 3967 | + user_id, | ||
| 3968 | + def_pickup_id | ||
| 3969 | + }, | ||
| 3970 | + success: function(res) { | ||
| 3971 | + if (res.data.code == 0) { | ||
| 3972 | + if (th.data.choice_sort_store == 0) th.setData({ | ||
| 3973 | + fir_pick_index: 0 | ||
| 3974 | + }); | ||
| 3975 | + getApp().globalData.pk_store = item; | ||
| 3976 | + } else { | ||
| 3977 | + //s.showWarning("设置默认门店地址失败", null, 500, !1); | ||
| 3978 | + getApp().my_warnning("设置默认门店地址失败",0,th) | ||
| 3979 | + } | ||
| 3980 | + | ||
| 3981 | + } | ||
| 3982 | + }); | ||
| 3983 | + | ||
| 3984 | + th.setData({ | ||
| 3985 | + def_pick_store: item, | ||
| 3986 | + sto_sele_name: item.pickup_name, | ||
| 3987 | + sto_sele_id: item.pickup_id, | ||
| 3988 | + sto_sele_distr: item.distr_type, | ||
| 3989 | + store: 0, | ||
| 3990 | + choice_sort_store: 0 | ||
| 3991 | + }); | ||
| 3992 | + | ||
| 3993 | + var openindstore = th.data.open_ind_store; | ||
| 3994 | + if (openindstore == 1) { | ||
| 3995 | + th.setData({ | ||
| 3996 | + openSpecModal: !0, | ||
| 3997 | + openSpecModal_ind: openindstore, | ||
| 3998 | + store: 0, | ||
| 3999 | + choice_sort_store: 0, | ||
| 4000 | + sort_store: 0, | ||
| 4001 | + }); | ||
| 4002 | + } else if (openindstore == 2) { | ||
| 4003 | + th.setData({ | ||
| 4004 | + openSpecModal: !0, | ||
| 4005 | + openSpecModal_ind: openindstore, | ||
| 4006 | + store: 0, | ||
| 4007 | + choice_sort_store: 0, | ||
| 4008 | + sort_store: 0, | ||
| 4009 | + }); | ||
| 4010 | + } | ||
| 4011 | + else if (openindstore == 4) { //4就是拼团 | ||
| 4012 | + th.setData({ | ||
| 4013 | + openSpecModal_pt: 1, //打开拼团购买界面 | ||
| 4014 | + store: 0, //关闭门店 | ||
| 4015 | + choice_sort_store: 0, //关闭门店2级 | ||
| 4016 | + sort_store: 0, //关闭门店2级 | ||
| 4017 | + }); | ||
| 4018 | + } | ||
| 4019 | + | ||
| 4020 | + else { | ||
| 4021 | + th.setData({ | ||
| 4022 | + store: 0, | ||
| 4023 | + choice_sort_store: 0, | ||
| 4024 | + sort_store: 0, | ||
| 4025 | + }) | ||
| 4026 | + } | ||
| 4027 | + }) | ||
| 4035 | }, | 4028 | }, |
| 4036 | 4029 | ||
| 4037 | wait_for_store_config: function() { | 4030 | wait_for_store_config: function() { |
| @@ -4074,7 +4067,7 @@ Page({ | @@ -4074,7 +4067,7 @@ Page({ | ||
| 4074 | //显示全部 | 4067 | //显示全部 |
| 4075 | toggleHandler: function(e) { | 4068 | toggleHandler: function(e) { |
| 4076 | var that = this, | 4069 | var that = this, |
| 4077 | - index = e.currentTarget.dataset.index; | 4070 | + index = e.currentTarget.dataset.index; |
| 4078 | for (var i = 0; i < that.data.comments.length; i++) { | 4071 | for (var i = 0; i < that.data.comments.length; i++) { |
| 4079 | if (index == i) { | 4072 | if (index == i) { |
| 4080 | for (var i = 0; i < that.data.comments.length; i++) { | 4073 | for (var i = 0; i < that.data.comments.length; i++) { |
| @@ -4091,7 +4084,7 @@ Page({ | @@ -4091,7 +4084,7 @@ Page({ | ||
| 4091 | //收起更多 | 4084 | //收起更多 |
| 4092 | toggleContent: function(e) { | 4085 | toggleContent: function(e) { |
| 4093 | var that = this, | 4086 | var that = this, |
| 4094 | - index = e.currentTarget.dataset.index; | 4087 | + index = e.currentTarget.dataset.index; |
| 4095 | for (var i = 0; i < that.data.comments.length; i++) { | 4088 | for (var i = 0; i < that.data.comments.length; i++) { |
| 4096 | if (index == i) { | 4089 | if (index == i) { |
| 4097 | that.data.comments[index].auto = true; | 4090 | that.data.comments[index].auto = true; |
| @@ -4105,84 +4098,82 @@ Page({ | @@ -4105,84 +4098,82 @@ Page({ | ||
| 4105 | 4098 | ||
| 4106 | //--- 获取卡类列表 --- | 4099 | //--- 获取卡类列表 --- |
| 4107 | getPlusCardType: function (func) { | 4100 | getPlusCardType: function (func) { |
| 4108 | - var storid = os.stoid; | ||
| 4109 | - var th = this; | ||
| 4110 | - var user=getApp().globalData.userInfo; | ||
| 4111 | - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { | ||
| 4112 | - var plusCard = res.data.data; | ||
| 4113 | - var arr = [1219, 2089, 3031]; | ||
| 4114 | - var new_arr = new Array(); | ||
| 4115 | - var card_name_map=new Map(); | ||
| 4116 | - for (var i = 0; i < plusCard.length; i++) { | ||
| 4117 | - if((user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue; | ||
| 4118 | - var name="card"+plusCard[i].CorrPrice.toLowerCase(); | ||
| 4119 | - card_name_map.set(name,plusCard[i].CardName); | ||
| 4120 | - } | ||
| 4121 | - | ||
| 4122 | - var ob={"card_list":plusCard,"name_map":card_name_map}; | ||
| 4123 | - func(ob); | ||
| 4124 | - }) | ||
| 4125 | - }, | ||
| 4126 | - | ||
| 4127 | - go_plus:function(){ | ||
| 4128 | - getApp().goto("/pages/user/plus/plus"); | ||
| 4129 | - }, | ||
| 4130 | - go_card_info:function(){ | ||
| 4131 | - getApp().goto("/pages/user/cardinfo/cardinfo"); | ||
| 4132 | - }, | ||
| 4133 | - //-- 根据ID拿出门店 -- | ||
| 4134 | - get_pick_from_list(pid){ | ||
| 4135 | - var all_pick_list=this.data.all_pick_list; | ||
| 4136 | - for(var i in all_pick_list){ | ||
| 4137 | - var item=all_pick_list[i]; | ||
| 4138 | - if(item.pickup_id==pid){ | ||
| 4139 | - return item; | ||
| 4140 | - } | ||
| 4141 | - } | ||
| 4142 | - }, | ||
| 4143 | - //-----显示优惠券的时候情况----- | ||
| 4144 | - show_more_cx:function () { | ||
| 4145 | - if(this.data.is_more_cx){ | ||
| 4146 | - this.setData({is_more_cx:0}); | ||
| 4147 | - }else{ | ||
| 4148 | - this.setData({is_more_cx:1}); | 4101 | + var storid = os.stoid; |
| 4102 | + var th = this; | ||
| 4103 | + var user=getApp().globalData.userInfo; | ||
| 4104 | + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { | ||
| 4105 | + var plusCard = res.data.data; | ||
| 4106 | + var arr = [1219, 2089, 3031]; | ||
| 4107 | + var new_arr = new Array(); | ||
| 4108 | + var card_name_map=new Map(); | ||
| 4109 | + for (var i = 0; i < plusCard.length; i++) { | ||
| 4110 | + if((user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue; | ||
| 4111 | + var name="card"+plusCard[i].CorrPrice.toLowerCase(); | ||
| 4112 | + card_name_map.set(name,plusCard[i].CardName); | ||
| 4113 | + } | ||
| 4114 | + | ||
| 4115 | + var ob={"card_list":plusCard,"name_map":card_name_map}; | ||
| 4116 | + func(ob); | ||
| 4117 | + }) | ||
| 4118 | + }, | ||
| 4119 | + | ||
| 4120 | + go_plus:function(){ | ||
| 4121 | + getApp().goto("/pages/user/plus/plus"); | ||
| 4122 | + }, | ||
| 4123 | + go_card_info:function(){ | ||
| 4124 | + getApp().goto("/pages/user/cardinfo/cardinfo"); | ||
| 4125 | + }, | ||
| 4126 | + //-- 根据ID拿出门店 -- | ||
| 4127 | + get_pick_from_list(pid){ | ||
| 4128 | + var all_pick_list=this.data.all_pick_list; | ||
| 4129 | + for(var i in all_pick_list){ | ||
| 4130 | + var item=all_pick_list[i]; | ||
| 4131 | + if(item.pickup_id==pid){ | ||
| 4132 | + return item; | ||
| 4149 | } | 4133 | } |
| 4134 | + } | ||
| 4135 | + }, | ||
| 4136 | + //-----显示优惠券的时候情况----- | ||
| 4137 | + show_more_cx:function () { | ||
| 4138 | + if(this.data.is_more_cx){ | ||
| 4139 | + this.setData({is_more_cx:0}); | ||
| 4140 | + }else{ | ||
| 4141 | + this.setData({is_more_cx:1}); | ||
| 4142 | + } | ||
| 4150 | }, | 4143 | }, |
| 4151 | 4144 | ||
| 4152 | //----跳转到搭配购买---- | 4145 | //----跳转到搭配购买---- |
| 4153 | go_prom_list:function () { | 4146 | go_prom_list:function () { |
| 4154 | wx.navigateTo({ url: "../../../packageA/pages/prom_list/prom_list?goods_id="+this.data.gid, }) | 4147 | wx.navigateTo({ url: "../../../packageA/pages/prom_list/prom_list?goods_id="+this.data.gid, }) |
| 4155 | }, | 4148 | }, |
| 4156 | - | 4149 | + |
| 4157 | //---检查有没有优惠活动--- | 4150 | //---检查有没有优惠活动--- |
| 4158 | check_is_youhui:function(gid){ | 4151 | check_is_youhui:function(gid){ |
| 4159 | - var th=this; | ||
| 4160 | - //调用接口判断订单优惠， | ||
| 4161 | - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+gid+"/0", {}).then(res => { | ||
| 4162 | - if(res.data.code==0){ | ||
| 4163 | - var r_data=res.data.data; | ||
| 4164 | - var max=0,min=0; | ||
| 4165 | - if(r_data.collocationList){ | ||
| 4166 | - for(var i in r_data.collocationList){ | ||
| 4167 | - if(max==0) max=r_data.collocationList[i].price; | ||
| 4168 | - if(min==0) min=r_data.collocationList[i].price; | ||
| 4169 | - | ||
| 4170 | - if(max<parseFloat(r_data.collocationList[i].price)) max=r_data.collocationList[i].price; | ||
| 4171 | - if(min>parseFloat(r_data.collocationList[i].price)) min=r_data.collocationList[i].price; | ||
| 4172 | - } | ||
| 4173 | - r_data.collocationPromList.max=(max+th.data.data.shop_price).toFixed(2); | ||
| 4174 | - r_data.collocationPromList.min=(min+th.data.data.shop_price).toFixed(2); | ||
| 4175 | - } | ||
| 4176 | - th.setData({ | ||
| 4177 | - order_prom:r_data.promOrder, | ||
| 4178 | - collocationGoods:r_data.collocationPromList, | ||
| 4179 | - prom_goods:r_data.promGoodsLists, | ||
| 4180 | - }) | ||
| 4181 | - } | ||
| 4182 | - }) | 4152 | + var th=this; |
| 4153 | + //调用接口判断订单优惠， | ||
| 4154 | + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+gid+"/0", {}).then(res => { | ||
| 4155 | + if(res.data.code==0){ | ||
| 4156 | + var r_data=res.data.data; | ||
| 4157 | + var max=0,min=0; | ||
| 4158 | + if(r_data.collocationList){ | ||
| 4159 | + for(var i in r_data.collocationList){ | ||
| 4160 | + if(max==0) max=r_data.collocationList[i].price; | ||
| 4161 | + if(min==0) min=r_data.collocationList[i].price; | ||
| 4162 | + | ||
| 4163 | + if(max<parseFloat(r_data.collocationList[i].price)) max=r_data.collocationList[i].price; | ||
| 4164 | + if(min>parseFloat(r_data.collocationList[i].price)) min=r_data.collocationList[i].price; | ||
| 4165 | + } | ||
| 4166 | + r_data.collocationPromList.max=(max+th.data.data.shop_price).toFixed(2); | ||
| 4167 | + r_data.collocationPromList.min=(min+th.data.data.shop_price).toFixed(2); | ||
| 4168 | + } | ||
| 4169 | + th.setData({ | ||
| 4170 | + order_prom:r_data.promOrder, | ||
| 4171 | + collocationGoods:r_data.collocationPromList, | ||
| 4172 | + prom_goods:r_data.promGoodsLists, | ||
| 4173 | + }) | ||
| 4174 | + } | ||
| 4175 | + }) | ||
| 4183 | } | 4176 | } |
| 4184 | - | ||
| 4185 | - | ||
| 4186 | 4177 | ||
| 4187 | 4178 | ||
| 4188 | 4179 |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -924,7 +924,7 @@ | @@ -924,7 +924,7 @@ | ||
| 924 | <view class="spec-goods"> | 924 | <view class="spec-goods"> |
| 925 | <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image> | 925 | <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image> |
| 926 | <view class="spec-goods-info"> | 926 | <view class="spec-goods-info"> |
| 927 | - <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view> | 927 | + <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view> |
| 928 | <view class="flex ai_end xc-val-money"> | 928 | <view class="flex ai_end xc-val-money"> |
| 929 | <view class="spec-goods-price" wx:if="{{prom_price==null}}" > | 929 | <view class="spec-goods-price" wx:if="{{prom_price==null}}" > |
| 930 | <text class="fs20">￥</text> | 930 | <text class="fs20">￥</text> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -555,7 +555,7 @@ border-radius: 0 56rpx 55rpx 0; | @@ -555,7 +555,7 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 555 | .spec-goods-name { | 555 | .spec-goods-name { |
| 556 | font-size: 30rpx; | 556 | font-size: 30rpx; |
| 557 | line-height: 35rpx; | 557 | line-height: 35rpx; |
| 558 | - height: 35rpx; | 558 | + height: 70rpx; |
| 559 | margin: 15rpx 20rpx 25rpx 0; | 559 | margin: 15rpx 20rpx 25rpx 0; |
| 560 | overflow: hidden; | 560 | overflow: hidden; |
| 561 | text-overflow: ellipsis;color: #333; | 561 | text-overflow: ellipsis;color: #333; |
| @@ -2454,7 +2454,7 @@ width: 20rpx; | @@ -2454,7 +2454,7 @@ width: 20rpx; | ||
| 2454 | height: 20rpx; | 2454 | height: 20rpx; |
| 2455 | } | 2455 | } |
| 2456 | .xc-val-money{ | 2456 | .xc-val-money{ |
| 2457 | - height:80rpx; | 2457 | + height:55rpx; |
| 2458 | } | 2458 | } |
| 2459 | 2459 | ||
| 2460 | .xc-distance-bottom{ | 2460 | .xc-distance-bottom{ |
pages/tabbar/tabbar.wxml
| @@ -76,7 +76,7 @@ | @@ -76,7 +76,7 @@ | ||
| 76 | <!-- 3 --> | 76 | <!-- 3 --> |
| 77 | <block wx:if="{{tabBar.active!='/pages/cart/cart/cart'}}"> | 77 | <block wx:if="{{tabBar.active!='/pages/cart/cart/cart'}}"> |
| 78 | <navigator url="/pages/cart/cart/cart" open-type="redirect" class="tabbar_item {{tabBar.clas}}" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;"> | 78 | <navigator url="/pages/cart/cart/cart" open-type="redirect" class="tabbar_item {{tabBar.clas}}" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;"> |
| 79 | - <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%"> | 79 | + <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%;display: flex;align-items: center;justify-content: center;"> |
| 80 | {{tabBar.cartGoodsNum}} | 80 | {{tabBar.cartGoodsNum}} |
| 81 | </view><view style="width:30%;height:54rpx;margin-left:35%;"> | 81 | </view><view style="width:30%;height:54rpx;margin-left:35%;"> |
| 82 | <image src="{{tabBar.url}}/miniapp/images/bar/car.png" class="img" style="width:100%;height:100%"></image> | 82 | <image src="{{tabBar.url}}/miniapp/images/bar/car.png" class="img" style="width:100%;height:100%"></image> |
| @@ -86,7 +86,7 @@ | @@ -86,7 +86,7 @@ | ||
| 86 | </block> | 86 | </block> |
| 87 | <block wx:else> | 87 | <block wx:else> |
| 88 | <view class="tabbar_item {{tabBar.clas}}" style="color: #f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;"> | 88 | <view class="tabbar_item {{tabBar.clas}}" style="color: #f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;"> |
| 89 | - <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%"> | 89 | + <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%;display: flex;align-items: center;justify-content: center;"> |
| 90 | {{tabBar.cartGoodsNum}} | 90 | {{tabBar.cartGoodsNum}} |
| 91 | </view><view style="width:30%;height:54rpx;margin-left:35%;"> | 91 | </view><view style="width:30%;height:54rpx;margin-left:35%;"> |
| 92 | <image src="{{tabBar.url}}/miniapp/images/bar/car_on.png" class="img" style="width:100%;height:100%"></image> | 92 | <image src="{{tabBar.url}}/miniapp/images/bar/car_on.png" class="img" style="width:100%;height:100%"></image> |
setting.js
| 1 | module.exports = { | 1 | module.exports = { |
| 2 | +<<<<<<< HEAD | ||
| 2 | appName: "美得得商户中心", | 3 | appName: "美得得商户中心", |
| 3 | versionCode: "1.3.1", | 4 | versionCode: "1.3.1", |
| 4 | appLogo: "../../../images/logo.png", | 5 | appLogo: "../../../images/logo.png", |
| @@ -7,4 +8,20 @@ module.exports = { | @@ -7,4 +8,20 @@ module.exports = { | ||
| 7 | imghost: "https://mshopimg.yolipai.net/", | 8 | imghost: "https://mshopimg.yolipai.net/", |
| 8 | share: {}, | 9 | share: {}, |
| 9 | stoid: 197, | 10 | stoid: 197, |
| 10 | -}; | ||
| 11 | \ No newline at end of file | 11 | \ No newline at end of file |
| 12 | +}; | ||
| 13 | +======= | ||
| 14 | + appName: "派派通", | ||
| 15 | + versionCode: "1.0.0", | ||
| 16 | + appLogo: "../../../images/logo.png", | ||
| 17 | + // url: "https://test-weshop.yolipai.net", | ||
| 18 | + url: "https://test-weshop.xinda100.cn", | ||
| 19 | + //url:"https://weshop.yolipai.net", //外网的网址 | ||
| 20 | + //url:"http://172.20.3.121:8085", //明海的网址 | ||
| 21 | + //url:"http://172.20.3.102:8085", //自己的网址 | ||
| 22 | + banner_err:"../../../images/del/logo.png", | ||
| 23 | + imghost: "https://mshopimg.yolipai.net/", | ||
| 24 | + share: {}, | ||
| 25 | + stoid:1, | ||
| 26 | + | ||
| 27 | +}; | ||
| 28 | +>>>>>>> 8cacb258d4c661260d724d7c9869476049e432e2 |
utils/filter.wxs
| 1 | var filters = { | 1 | var filters = { |
| 2 | - toFix:function(val,count){ | ||
| 3 | - val=parseFloat(val); | ||
| 4 | - return val.toFixed(count) | ||
| 5 | - }, | ||
| 6 | - replace_time:function(val){ | ||
| 7 | - if(!val) return "不限"; | ||
| 8 | - return val.replace("00:00:00",""); | ||
| 9 | - }, | ||
| 10 | - | ||
| 11 | - replace_time2: function (val) { | ||
| 12 | - if(val==null || val==undefined || val=='') return ""; | ||
| 13 | - var a = val.split(" "); | ||
| 14 | - return a[0]; | ||
| 15 | - }, | 2 | + toFix: function (val, count) { |
| 3 | + val = parseFloat(val); | ||
| 4 | + return val.toFixed(count) | ||
| 5 | + }, | ||
| 6 | + replace_time: function (val) { | ||
| 7 | + if (!val) return "不限"; | ||
| 8 | + return val.replace("00:00:00", ""); | ||
| 9 | + }, | ||
| 16 | 10 | ||
| 17 | - format_time:function(ts,isFull) { | ||
| 18 | - if(ts==null || ts==undefined || ts=='') return ""; | ||
| 19 | - var d = getDate(ts*1000) | ||
| 20 | - var fm=[d.getFullYear(), d.getMonth()+1, d.getDate()].join('-'); | ||
| 21 | - if(isFull==1) | ||
| 22 | - fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') | ||
| 23 | - return fm; | ||
| 24 | - }, | 11 | + replace_time2: function (val) { |
| 12 | + if (val == null || val == undefined || val == '') return ""; | ||
| 13 | + var a = val.split(" "); | ||
| 14 | + return a[0]; | ||
| 15 | + }, | ||
| 25 | 16 | ||
| 26 | - pInt:function(t) { | ||
| 27 | - var d = parseInt(t); return d; | ||
| 28 | - }, | 17 | + format_time: function (ts, isFull) { |
| 18 | + // 如果数值位数为1，则补0 | ||
| 19 | + function appendZero(obj) { | ||
| 20 | + if (obj < 10) { | ||
| 21 | + return "0" + "" + obj; | ||
| 22 | + } else { | ||
| 23 | + return obj; | ||
| 24 | + } | ||
| 25 | + }; | ||
| 26 | + | ||
| 27 | + if (ts == null || ts == undefined || ts == '') return ""; | ||
| 28 | + var d = getDate(ts * 1000) | ||
| 29 | + var fm = [d.getFullYear(), d.getMonth() + 1, d.getDate()].join('-'); | ||
| 30 | + var md = (d.getMonth() + 1) + '月' + d.getDate() + '日'; | ||
| 31 | + if (isFull == 1) | ||
| 32 | + fm = fm + ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':'); | ||
| 33 | + if (isFull == 2) { | ||
| 34 | + fm = md + ' ' + [appendZero(d.getHours()), appendZero(d.getMinutes())].join(':'); | ||
| 35 | + } | ||
| 36 | + return fm; | ||
| 37 | + }, | ||
| 38 | + | ||
| 39 | + pInt: function (t) { | ||
| 40 | + var d = parseInt(t); | ||
| 41 | + return d; | ||
| 42 | + }, | ||
| 43 | + | ||
| 44 | + show_gui_ge: function (spec, color) { | ||
| 45 | + if ((spec == "" || spec == null || spec == "null")) { | ||
| 46 | + if ((color == "" || color == null || color == "null")) { | ||
| 47 | + return "规格1"; | ||
| 48 | + } else { | ||
| 49 | + return color; | ||
| 50 | + } | ||
| 51 | + } else { | ||
| 52 | + if ((color == "" || color == null || color == "null")) { | ||
| 53 | + return spec; | ||
| 54 | + } else { | ||
| 55 | + return spec + "/" + color; | ||
| 56 | + } | ||
| 57 | + } | ||
| 58 | + } | ||
| 59 | +}; | ||
| 29 | 60 | ||
| 30 | - show_gui_ge:function(spec,color){ | ||
| 31 | - if((spec=="" || spec==null || spec=="null")){ | ||
| 32 | - if((color=="" || color==null || color=="null")){ return "规格1"; | ||
| 33 | - }else{return color; } | ||
| 34 | - }else{ | ||
| 35 | - if((color=="" || color==null || color=="null")){ return spec; | ||
| 36 | - }else{ return spec+"/"+color; } | ||
| 37 | - } | ||
| 38 | - }, | ||
| 39 | - | ||
| 40 | - | ||
| 41 | -} | ||
| 42 | module.exports = { | 61 | module.exports = { |
| 43 | - toFix: filters.toFix, | ||
| 44 | - replace_time:filters.replace_time, | ||
| 45 | - replace_time2: filters.replace_time2, | ||
| 46 | - format_time:filters.format_time, | ||
| 47 | - pInt:filters.pInt, | ||
| 48 | - show_gui_ge:filters.show_gui_ge, | 62 | + toFix: filters.toFix, |
| 63 | + replace_time: filters.replace_time, | ||
| 64 | + replace_time2: filters.replace_time2, | ||
| 65 | + format_time: filters.format_time, | ||
| 66 | + pInt: filters.pInt, | ||
| 67 | + show_gui_ge: filters.show_gui_ge, | ||
| 49 | } | 68 | } |
| 50 | \ No newline at end of file | 69 | \ No newline at end of file |