Skip to content

Commit ceac927

Browse files
bailicangdubailicangdu
committed
udpate
1 parent 40150be commit ceac927

34 files changed

+211
-114
lines changed

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ npm run build
122122
- [x] 服务中心 -- 完成
123123
- [x] 红包 -- 完成
124124
- [x] 上传头像 -- 完成
125-
</br>
126-
~~付款 -- 臣妾做不到啊~~
125+
- [ ] 付款 -- 臣妾做不到啊~~
127126

128127

129128

elm/static/js/food.190bb07fa12e111e2b1c.min.js renamed to elm/static/js/food.8589991c701e4730197f.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

elm/static/js/foodDetail.f49f8e65e801c1cbac4b.min.js renamed to elm/static/js/foodDetail.16605c17c408b9e90c48.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎elm/static/js/manifest.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎elm/static/js/shop.33fbea55cdb3167f10f2.min.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎elm/static/js/shop.90b10edceede5a83485f.min.js‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/common/buyCart.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<transition name="fade">
1212
<span class="cart_num" v-if="foodNum">{{foodNum}}</span>
1313
</transition>
14-
<svg class="add_icon" @click="addToCart(foods.category_id, foods.item_id, foods.specfoods[0].food_id, foods.specfoods[0].name, foods.specfoods[0].price, '', foods.specfoods[0].packing_fee, foods.specfoods[0].sku_id, foods.specfoods[0].stock, $event)">
14+
<svg class="add_icon" @touchstart="addToCart(foods.category_id, foods.item_id, foods.specfoods[0].food_id, foods.specfoods[0].name, foods.specfoods[0].price, '', foods.specfoods[0].packing_fee, foods.specfoods[0].sku_id, foods.specfoods[0].stock, $event)">
1515
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#cart-add"></use>
1616
</svg>
1717
</section>

‎src/components/common/computeTime.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
closeTip(){
3131
this.$emit('closeTip')
3232
},
33+
//计算时间
3334
remainingTime(){
3435
clearInterval(this.timer);
3536
this.timer = setInterval(() => {
@@ -47,6 +48,7 @@
4748
}
4849
},
4950
computed: {
51+
//转换时间成分秒
5052
remaining: function (){
5153
let minute = parseInt(this.countNum/60);
5254
let second = parseInt(this.countNum%60);
@@ -58,6 +60,7 @@
5860
}
5961
return '去支付(还剩' + minute + '分' + second + '秒)';
6062
},
63+
//订单返回时间秒分分别处理
6164
numTime: function (){
6265
if (this.time.indexOf('分钟') !== -1) {
6366
return parseInt(this.time)*60;

‎src/components/common/shoplist.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ export default {
131131
this.offset = 0;
132132
let res = await shopList(this.latitude, this.longitude, this.offset, '', this.restaurantCategoryIds, this.sortByType, this.deliveryMode, this.supportIds);
133133
this.hideLoading();
134+
//考虑到本地模拟数据是引用类型，所以返回一个新的数组
134135
this.shopListArr = [...res];
135136
if (process.env.NODE_ENV !== 'development') {
136137
this.shopListArr = this.shopListArr.reverse();
137138
}
138139
},
140+
//开发环境与编译环境loading隐藏方式不同
139141
hideLoading(){
140142
if (process.env.NODE_ENV !== 'development') {
141143
clearTimeout(this.timer);

‎src/page/benefit/benefit.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@
9595
export default {
9696
data(){
9797
return{
98-
showAlert: false,
99-
alertText: null,
100-
showLoading: true,
101-
hongbaoList: null,
102-
categoryType: 1,
98+
showAlert: false, //弹出框
99+
alertText: null, //弹出框文字
100+
showLoading: true, //加载动画
101+
hongbaoList: null, //红包列表
102+
categoryType: 1, //红包与商家代金券切换
103103
104104
}
105105
},

0 commit comments

Comments
 (0)