This commit is contained in:
Gao xiaosong
2020-03-16 01:40:52 +08:00
parent 397082cdaf
commit e215701560
216 changed files with 11659 additions and 13905 deletions

View File

@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
@ -208,13 +208,13 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
methods: {
goDetail: function goDetail(id) {
this.$yrouter.push({
path: "/pages/activity/DargainDetails/main",
path: "/pages/activity/DargainDetails/index",
query: { id: id, partake: 0 } });
},
goList: function goList() {
this.$yrouter.push({
path: "/pages/activity/GoodsBargain/main" });
path: "/pages/activity/GoodsBargain/index" });
},
getBargainUserList: function getBargainUserList() {
@ -229,7 +229,7 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
that.loadingList = false;
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -240,7 +240,7 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
var that = this;
(0, _activity.getBargainUserCancel)({ bargainId: bargainId }).
then(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "success",
duration: 2000 });
@ -252,13 +252,14 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
that.getBargainUserList();
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
});
} } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ })

View File

@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
@ -383,7 +383,7 @@ var NAME = "DargainDetails";var _default =
{
that.bargainPartake = that.userInfo.uid;
// that.$yrouter.push({
// path: "/pages/activity/DargainDetails/main",
// path: "/pages/activity/DargainDetails/index",
// query: { id: that.bargainId, partake: that.bargainPartake }
// });
} else {
@ -409,7 +409,7 @@ var NAME = "DargainDetails";var _default =
(0, _store.postCartAdd)(data).
then(function (res) {
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId } });
}).
@ -421,13 +421,13 @@ var NAME = "DargainDetails";var _default =
var that = this;
that.getBargainShare(that.bargainId);
this.$yrouter.push({
path: "/pages/activity/Poster/main",
path: "/pages/activity/Poster/index",
query: { id: that.bargainId, type: 2 } });
},
goList: function goList() {
this.$yrouter.push({
path: "/pages/activity/GoodsBargain/main" });
path: "/pages/activity/GoodsBargain/index" });
},
//砍价分享
@ -452,7 +452,7 @@ var NAME = "DargainDetails";var _default =
that.getBargainHelpCount();
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -468,7 +468,7 @@ var NAME = "DargainDetails";var _default =
that.getBargainHelp();
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -482,7 +482,7 @@ var NAME = "DargainDetails";var _default =
that.surplusPrice === 0 &&
that.bargainPartake !== that.userInfo.uid)
{
return wx.showToast({
return uni.showToast({
title: "好友已经砍价成功",
icon: "success",
duration: 2000 });
@ -507,7 +507,7 @@ var NAME = "DargainDetails";var _default =
that.getBargainHelpPrice();
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -534,7 +534,7 @@ var NAME = "DargainDetails";var _default =
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -560,7 +560,7 @@ var NAME = "DargainDetails";var _default =
that.bargainHelpList.push.apply(that.bargainHelpList, res.data);
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -576,7 +576,7 @@ var NAME = "DargainDetails";var _default =
then(function () {}).
catch(function () {
// that.$yrouter.push({
// path: "/pages/activity/DargainDetails/main",
// path: "/pages/activity/DargainDetails/index",
// query: { id: that.bargainId, partake: that.userInfo.uid }
// });
});
@ -598,7 +598,7 @@ var NAME = "DargainDetails";var _default =
catch(function () {
that.bargainPartake = that.userInfo.uid;
// that.$yrouter.push({
// path: "/pages/activity/DargainDetails/main",
// path: "/pages/activity/DargainDetails/index",
// query: { id: that.bargainId, partake: that.userInfo.uid }
// });
});
@ -614,7 +614,7 @@ var NAME = "DargainDetails";var _default =
that.getBargainHelpList();
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -627,11 +627,12 @@ var NAME = "DargainDetails";var _default =
onShareAppMessage: function onShareAppMessage() {
return {
path: "/pages/activity/DargainDetails/main/?id=".concat(
path: "/pages/activity/DargainDetails/index/?id=".concat(
this.$yroute.query.id, "&partake=").concat(
this.userInfo.uid) };
} };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }),

View File

@ -213,7 +213,7 @@ var _default = { name: "GoodsBargain", components: {}, props: {}, data: function
loading: false, //当前接口是否请求完成 false 完成 true 未完成
page: 1, //页码
limit: 20 //数量
};}, mounted: function mounted() {this.getBargainList();}, methods: { getBargainList: function getBargainList() {var that = this;if (that.loading) return;if (that.status) return;that.loading = true;(0, _activity.getBargainList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.bargainLis.push.apply(that.bargainLis, res.data);that.page++;that.loading = false;});}, goDetail: function goDetail(id) {this.$yrouter.push({ path: "/pages/activity/DargainDetails/main", query: { id: id, partake: 0 } });} } };exports.default = _default;
};}, mounted: function mounted() {this.getBargainList();}, methods: { getBargainList: function getBargainList() {var that = this;if (that.loading) return;if (that.status) return;that.loading = true;(0, _activity.getBargainList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.bargainLis.push.apply(that.bargainLis, res.data);that.page++;that.loading = false;});}, goDetail: function goDetail(id) {this.$yrouter.push({ path: "/pages/activity/DargainDetails/index", query: { id: id, partake: 0 } });} } };exports.default = _default;
/***/ })

View File

@ -227,7 +227,7 @@ var Loading = function Loading() {return __webpack_require__.e(/*! import() | co
page: 1, //页码
limit: 20, //数量
loadingList: false };}, mounted: function mounted() {// document.querySelector('body').setAttribute('style', 'background-color:#73CBB6');
this.getCombinationList();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getCombinationList();}, methods: { getCombinationList: function getCombinationList() {var that = this;if (that.loading) return;if (that.status) return;(0, _activity.getCombinationList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.combinationList.push.apply(that.combinationList, res.data);that.page++;that.loading = false;});}, link: function link(id) {this.$yrouter.push({ path: "/pages/activity/GroupDetails/main", query: { id: id } });} } };exports.default = _default;
this.getCombinationList();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getCombinationList();}, methods: { getCombinationList: function getCombinationList() {var that = this;if (that.loading) return;if (that.status) return;(0, _activity.getCombinationList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.combinationList.push.apply(that.combinationList, res.data);that.page++;that.loading = false;});}, link: function link(id) {this.$yrouter.push({ path: "/pages/activity/GroupDetails/index", query: { id: id } });} } };exports.default = _default;
/***/ })

View File

@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
@ -301,7 +301,7 @@ var CountDown = function CountDown() {return __webpack_require__.e(/*! import()
loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
page: 1, //页码
limit: 5, //数量
title: [] };}, mounted: function mounted() {this.mountedStart();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getSeckillList();}, methods: { mountedStart: function mountedStart() {var that = this;wx.showLoading();(0, _activity.getSeckillConfig)().then(function (res) {that.$set(that, "headerImg", res.data.lovely);that.$set(that, "timeList", res.data.seckillTime);that.$set(that, "active", res.data.seckillTimeIndex);var title = [];title = res.data.seckillTime.map(function (item, index) {return { name: "div", attrs: { class: "timeItem" }, children: [{ name: "div", attrs: { class: "time" }, children: [{ type: "text", text: item.time }] }, { name: "div", attrs: { class: "state" }, children: [{ type: "text", text: item.state }] }] };});that.$set(that, "title", title);that.datatime = that.timeList[that.active].stop;that.getSeckillList();that.$nextTick(function () {that.sticky = true;wx.hideLoading();});});}, setTime: function setTime(event) {var that = this;
title: [] };}, mounted: function mounted() {this.mountedStart();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getSeckillList();}, methods: { mountedStart: function mountedStart() {var that = this;uni.showLoading();(0, _activity.getSeckillConfig)().then(function (res) {that.$set(that, "headerImg", res.data.lovely);that.$set(that, "timeList", res.data.seckillTime);that.$set(that, "active", res.data.seckillTimeIndex);var title = [];title = res.data.seckillTime.map(function (item, index) {return { name: "div", attrs: { class: "timeItem" }, children: [{ name: "div", attrs: { class: "time" }, children: [{ type: "text", text: item.time }] }, { name: "div", attrs: { class: "state" }, children: [{ type: "text", text: item.state }] }] };});that.$set(that, "title", title);that.datatime = that.timeList[that.active].stop;that.getSeckillList();that.$nextTick(function () {that.sticky = true;uni.hideLoading();});});}, setTime: function setTime(event) {var that = this;
that.active = event.mp.detail.index;
that.datatime = that.timeList[that.active].stop;
that.getSeckillList();
@ -315,17 +315,18 @@ var CountDown = function CountDown() {return __webpack_require__.e(/*! import()
that.status = res.data.length < that.limit;
that.seckillList.push.apply(that.seckillList, res.data);
that.page++;
wx.hideLoading();
uni.hideLoading();
});
},
goDetail: function goDetail(id) {
var that = this;
var time = that.timeList[that.active].stop;
this.$yrouter.push({
path: "/pages/activity/SeckillDetails/main",
path: "/pages/activity/SeckillDetails/index",
query: { id: id, time: time } });
} } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }),

View File

@ -393,14 +393,14 @@ var NAME = "GroupDetails";var _default =
groupRule: function groupRule(id) {
var that = this;
that.$yrouter.push({
path: "/pages/activity/GroupRule/main",
path: "/pages/activity/GroupRule/index",
query: { id: id } });
},
goReply: function goReply() {
var that = this;
that.$yrouter.push({
path: "/pages/shop/EvaluateList/main",
path: "/pages/shop/EvaluateList/index",
query: { id: that.storeInfo.product_id } });
},
@ -448,7 +448,7 @@ var NAME = "GroupDetails";var _default =
(0, _store.postCartAdd)(data).
then(function (res) {
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId } });
}).

View File

@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
@ -281,7 +281,7 @@ var NAME = "GroupRule";var _default =
(0, _store.postCartAdd)(data).
then(function (res) {
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId, pinkid: that.pinkId } });
}).
@ -292,27 +292,27 @@ var NAME = "GroupRule";var _default =
goPoster: function goPoster() {
var that = this;
this.$yrouter.push({
path: "/pages/activity/Poster/main",
path: "/pages/activity/Poster/index",
query: { id: that.pinkId, type: 1 } });
},
goOrder: function goOrder() {
var that = this;
this.$yrouter.push({
path: "/pages/order/OrderDetails/main",
path: "/pages/order/OrderDetails/index",
query: { id: that.currentPinkOrder } });
},
//拼团列表
goList: function goList() {
this.$yrouter.push({
path: "/pages/activity/GoodsGroup/main" });
path: "/pages/activity/GoodsGroup/index" });
},
//拼团详情
goDetail: function goDetail(id) {
this.$yrouter.push({
path: "/pages/activity/GroupDetails/main",
path: "/pages/activity/GroupDetails/index",
query: { id: id } });
},
@ -335,14 +335,14 @@ var NAME = "GroupRule";var _default =
var that = this;
(0, _activity.getCombinationRemove)({ id: that.pinkId, cid: that.storeCombination.id }).
then(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -352,6 +352,7 @@ var NAME = "GroupRule";var _default =
lookAll: function lookAll() {
this.iShidden = !this.iShidden;
} } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ })

View File

@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
@ -183,7 +183,7 @@ var _default = { name: "Poster", components: {}, props: {}, data: function data(
that.status = false;
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
@ -199,13 +199,14 @@ var _default = { name: "Poster", components: {}, props: {}, data: function data(
that.status = false;
}).
catch(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
});
} } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }),

View File

@ -102,13 +102,6 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
if (!_vm._isMounted) {
_vm.e0 = function($event) {
return _vm.$yrouter.push({
path: "/pages/user/CustomerList/index"
})
}
}
}
var recyclableRender = false
var staticRenderFns = []
@ -267,6 +260,9 @@ var NAME = "SeckillDetails";var _default =
this.mountedStart();
},
methods: {
routerGo: function routerGo(item) {
this.$yrouter.push({ path: '/pages/user/CustomerList/index' });
},
mountedStart: function mountedStart() {
var that = this;
var id = that.$yroute.query.id;
@ -351,7 +347,7 @@ var NAME = "SeckillDetails";var _default =
then(function (res) {
console.log(res);
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId } });
}).

View File

@ -1 +1 @@
<view hidden="{{!(domStatus)}}" class="{{['_div data-v-69b60570',posterImageStatus?'noscroll product-con':'product-con']}}"><product-con-swiper vue-id="4a3c0059-1" imgUrls="{{imgUrls}}" class="data-v-69b60570" bind:__l="__l"></product-con-swiper><view class="nav acea-row row-between-wrapper _div data-v-69b60570"><view class="money _div data-v-69b60570">¥<label class="num _span data-v-69b60570">{{storeInfo.price}}</label><label class="y-money _span data-v-69b60570">{{'¥'+storeInfo.price}}</label></view><view class="acea-row row-middle _div data-v-69b60570"><view class="times _div data-v-69b60570"><view class="_div data-v-69b60570">距秒杀结束仅剩</view><count-down vue-id="4a3c0059-2" is-day="{{false}}" tip-text day-text hour-text=" : " minute-text=" : " second-text datatime="{{datatime}}" class="data-v-69b60570" bind:__l="__l"></count-down></view><view class="iconfont icon-jiantou _div data-v-69b60570"></view></view></view><view class="wrapperRush _div data-v-69b60570"><view class="introduce acea-row row-between _div data-v-69b60570"><view class="infor _div data-v-69b60570">{{storeInfo.title}}</view><view data-event-opts="{{[['tap',[['setPosterImageStatus',['$event']]]]]}}" class="iconfont icon-fenxiang _div data-v-69b60570" bindtap="__e"></view></view><view class="label acea-row row-middle _div data-v-69b60570"><view class="stock _div data-v-69b60570">{{'库存:'+storeInfo.stock+'件'}}</view><view class="_div data-v-69b60570">{{'销量:'+storeInfo.sales+'件'}}</view></view></view><view class="product-intro _div data-v-69b60570"><view class="title _div data-v-69b60570">产品介绍</view><view class="conter _div data-v-69b60570"><rich-text nodes="{{storeInfo.description}}"></rich-text></view></view><view style="height:100rpx;" class="_div data-v-69b60570"></view><view class="footerRush acea-row row-between-wrapper _div data-v-69b60570"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="customerSer acea-row row-center-wrapper row-column _div data-v-69b60570" bindtap="__e"><view class="iconfont icon-kefu _div data-v-69b60570"></view><view class="_div data-v-69b60570">客服</view></view><view data-event-opts="{{[['tap',[['tapBuy',['$event']]]]]}}" class="bnt bg-color-red _div data-v-69b60570" bindtap="__e">立即购买</view></view><product-window vue-id="4a3c0059-3" attr="{{attr}}" cartNum="{{cartNum}}" data-event-opts="{{[['^changeFun',[['changeFun']]]]}}" bind:changeFun="__e" class="data-v-69b60570" bind:__l="__l"></product-window><store-poster vue-id="4a3c0059-4" posterImageStatus="{{posterImageStatus}}" posterData="{{posterData}}" data-event-opts="{{[['^setPosterImageStatus',[['setPosterImageStatus']]]]}}" bind:setPosterImageStatus="__e" class="data-v-69b60570" bind:__l="__l"></store-poster></view>
<view hidden="{{!(domStatus)}}" class="{{['_div data-v-69b60570',posterImageStatus?'noscroll product-con':'product-con']}}"><product-con-swiper vue-id="4a3c0059-1" imgUrls="{{imgUrls}}" class="data-v-69b60570" bind:__l="__l"></product-con-swiper><view class="nav acea-row row-between-wrapper _div data-v-69b60570"><view class="money _div data-v-69b60570">¥<label class="num _span data-v-69b60570">{{storeInfo.price}}</label><label class="y-money _span data-v-69b60570">{{'¥'+storeInfo.price}}</label></view><view class="acea-row row-middle _div data-v-69b60570"><view class="times _div data-v-69b60570"><view class="_div data-v-69b60570">距秒杀结束仅剩</view><count-down vue-id="4a3c0059-2" is-day="{{false}}" tip-text day-text hour-text=" : " minute-text=" : " second-text datatime="{{datatime}}" class="data-v-69b60570" bind:__l="__l"></count-down></view><view class="iconfont icon-jiantou _div data-v-69b60570"></view></view></view><view class="wrapperRush _div data-v-69b60570"><view class="introduce acea-row row-between _div data-v-69b60570"><view class="infor _div data-v-69b60570">{{storeInfo.title}}</view><view data-event-opts="{{[['tap',[['setPosterImageStatus',['$event']]]]]}}" class="iconfont icon-fenxiang _div data-v-69b60570" bindtap="__e"></view></view><view class="label acea-row row-middle _div data-v-69b60570"><view class="stock _div data-v-69b60570">{{'库存:'+storeInfo.stock+'件'}}</view><view class="_div data-v-69b60570">{{'销量:'+storeInfo.sales+'件'}}</view></view></view><view class="product-intro _div data-v-69b60570"><view class="title _div data-v-69b60570">产品介绍</view><view class="conter _div data-v-69b60570"><rich-text nodes="{{storeInfo.description}}"></rich-text></view></view><view style="height:100rpx;" class="_div data-v-69b60570"></view><view class="footerRush acea-row row-between-wrapper _div data-v-69b60570"><view data-event-opts="{{[['tap',[['routerGo']]]]}}" class="customerSer acea-row row-center-wrapper row-column _div data-v-69b60570" bindtap="__e"><view class="iconfont icon-kefu _div data-v-69b60570"></view><view class="_div data-v-69b60570">客服</view></view><view data-event-opts="{{[['tap',[['tapBuy',['$event']]]]]}}" class="bnt bg-color-red _div data-v-69b60570" bindtap="__e">立即购买</view></view><product-window vue-id="4a3c0059-3" attr="{{attr}}" cartNum="{{cartNum}}" data-event-opts="{{[['^changeFun',[['changeFun']]]]}}" bind:changeFun="__e" class="data-v-69b60570" bind:__l="__l"></product-window><store-poster vue-id="4a3c0059-4" posterImageStatus="{{posterImageStatus}}" posterData="{{posterData}}" data-event-opts="{{[['^setPosterImageStatus',[['setPosterImageStatus']]]]}}" bind:setPosterImageStatus="__e" class="data-v-69b60570" bind:__l="__l"></store-poster></view>