From 0b3a2505030bb96a4aa766cc15d4b354df04e360 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Wed, 24 Aug 2022 18:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9-0824?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 2 +-
pages/index/index.vue | 17 +-
pagesA/order/detail.vue | 2 +-
pagesB/about/about.vue | 2 +-
pagesB/integral-rule/integral-rule.vue | 8 +-
pagesB/shop-detail/shop-detail.vue | 19 +-
.../.sourcemap/mp-weixin/common/main.js.map | 2 +-
.../.sourcemap/mp-weixin/common/vendor.js.map | 2 +-
.../components/nothing/nothing-page.js.map | 2 +-
.../share-coupon/share-coupon.js.map | 2 +-
.../components/status-nav/status-nav.js.map | 2 +-
.../components/swipers/swiper-pu.js.map | 2 +-
.../mp-weixin/components/tabbar/tabbar.js.map | 2 +-
.../mp-weixin/pages/cart/cart.js.map | 2 +-
.../mp-weixin/pages/index/index.js.map | 2 +-
.../.sourcemap/mp-weixin/pages/my/my.js.map | 2 +-
.../mp-weixin/pagesA/address/address.js.map | 2 +-
.../mp-weixin/pagesA/order/detail.js.map | 2 +-
.../mp-weixin/pagesB/about/about.js.map | 2 +-
.../pagesB/integral-rule/integral-rule.js.map | 2 +-
.../pagesB/shop-detail/shop-detail.js.map | 2 +-
unpackage/dist/dev/mp-weixin/common/main.js | 4 +-
unpackage/dist/dev/mp-weixin/common/vendor.js | 16 +-
.../components/nothing/nothing-page.js | 28 +-
.../components/share-coupon/share-coupon.js | 30 +-
.../components/status-nav/status-nav.js | 28 +-
.../mp-weixin/components/swipers/swiper-pu.js | 28 +-
.../dev/mp-weixin/components/tabbar/tabbar.js | 28 +-
.../dist/dev/mp-weixin/pages/cart/cart.js | 2 +-
.../dist/dev/mp-weixin/pages/cart/finish.js | 2 +-
.../dev/mp-weixin/pages/cart/settlement.js | 2 +-
.../dist/dev/mp-weixin/pages/index/index.js | 13 +-
.../dist/dev/mp-weixin/pages/index/index.wxml | 2 +-
unpackage/dist/dev/mp-weixin/pages/my/my.js | 4 +-
.../dev/mp-weixin/pagesA/address/address.js | 62 ++--
.../dev/mp-weixin/pagesA/coupon/coupon.js | 26 +-
.../pagesA/distribution/distribution.js | 28 +-
.../dev/mp-weixin/pagesA/integral/integral.js | 26 +-
.../dist/dev/mp-weixin/pagesA/order/detail.js | 268 +++++++++---------
.../dist/dev/mp-weixin/pagesA/order/order.js | 26 +-
.../dev/mp-weixin/pagesA/recharge/recharge.js | 26 +-
.../dist/dev/mp-weixin/pagesB/about/about.js | 28 +-
.../pagesB/disclaimers/disclaimers.js | 26 +-
.../pagesB/distributor/distributor.js | 26 +-
.../pagesB/integral-rule/integral-rule.js | 36 +--
.../pagesB/integral-rule/integral-rule.wxml | 2 +-
.../pagesB/shop-detail/shop-detail.js | 94 ++++--
.../pagesB/shop-detail/shop-detail.wxml | 2 +-
.../pagesB/shop-detail/shop-detail.wxss | 7 +
.../dev/mp-weixin/pagesB/ucenter/ucenter.js | 26 +-
.../dist/dev/mp-weixin/project.config.json | 2 +-
51 files changed, 522 insertions(+), 456 deletions(-)
create mode 100644 unpackage/dist/dev/mp-weixin/pagesB/shop-detail/shop-detail.wxss
diff --git a/manifest.json b/manifest.json
index 1eddc7a..300b96b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "老农极鲜",
+ "name" : "老农极鲜土货",
"appid" : "__UNI__768F35C",
"description" : "这是一款基于uniapp开发的app和微信小程序的模板框架",
"versionName" : "1.0.0",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 534ecdd..3059fd3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -43,8 +43,11 @@
{{item.name}}
￥{{item.price}}
- {{item.amount>=1000?'999+':item.amount}}件已售
- 加入购物车
+
+ {{item.amount>=1000?'999+':item.amount}}件已售
+
+ 加入购物车
+ 商品已售罄
@@ -75,8 +78,11 @@
{{item.name}}
￥{{item.price}}
- {{item.stock>=100?'99+':item.stock}}件已售
- 加入购物车
+
+ {{item.amount>=1000?'999+':item.amount}}件已售
+
+ 加入购物车
+ 商品已售罄
@@ -268,7 +274,8 @@
tag:item.tag,
stock:item.stock,
sku_id:item.default_sku.id,
- amount:item.amount,
+ amount:item.amount,
+ is_over:item.is_over,
}
commodityArr.push(obj)
})
diff --git a/pagesA/order/detail.vue b/pagesA/order/detail.vue
index eba378b..a14533e 100644
--- a/pagesA/order/detail.vue
+++ b/pagesA/order/detail.vue
@@ -214,7 +214,7 @@
this.$requst.get('/api/index/base-config').then(res=>{
if(res.code==0) {
console.log(res,'客服电话');
- this.$toolAll.tools.countCustomer(res.data.customer_service_tel,res.data.customer_service_tel);
+ this.$toolAll.tools.countCustomer(res.data.customer_service_tel,res.data.customer_service_after_tel);
} else {
this.$toolAll.tools.showToast(res.msg)
}
diff --git a/pagesB/about/about.vue b/pagesB/about/about.vue
index 30e09c5..f4b6715 100644
--- a/pagesB/about/about.vue
+++ b/pagesB/about/about.vue
@@ -29,7 +29,7 @@
uni.showLoading({
title:'加载中'
});
- this.$requst.get('/api/index/statement').then(res=>{
+ this.$requst.get('/api/index/about').then(res=>{
if(res.code==0){
this.about = this.$toolAll.tools.escape2Html(res.data.content);
} else {
diff --git a/pagesB/integral-rule/integral-rule.vue b/pagesB/integral-rule/integral-rule.vue
index 60a58ab..ec17e4e 100644
--- a/pagesB/integral-rule/integral-rule.vue
+++ b/pagesB/integral-rule/integral-rule.vue
@@ -4,8 +4,7 @@
- 每{{integral_rule.deduction_points_score}}积分可抵扣{{integral_rule.deduction_points_score_value}}元；
- 每下单{{integral_rule.place_order_score}}元，可获得{{integral_rule.place_order_score_value}}积分。
+
@@ -31,9 +30,10 @@
uni.showLoading({
title:'加载中'
});
- this.$requst.get('/api/user/integral-rule').then(res=>{
+ this.$requst.get('/api/index/base-config').then(res=>{
if(res.code==0){
- this.integral_rule = res.data;
+ console.log(res,'积分规则')
+ this.integral_rule = this.$toolAll.tools.escape2Html(res.data.score_rule);
} else {
this.$toolAll.tools.showToast(res.msg);
}
diff --git a/pagesB/shop-detail/shop-detail.vue b/pagesB/shop-detail/shop-detail.vue
index 1bc0352..60568f3 100644
--- a/pagesB/shop-detail/shop-detail.vue
+++ b/pagesB/shop-detail/shop-detail.vue
@@ -26,23 +26,25 @@
+
- 规格选择
+ {{shopDetail.is_over==0?'规格选择':'商品已售罄'}}
-
+
{{item.title}}
￥{{vip_level>0?item.price:item.original_price}}
-
+
加入购物车
立即购买
+ 预估上货时间：{{shopDetail.cycle!==''?shopDetail.cycle:'未知'}}