diff --git a/pages.json b/pages.json
index 12757b3..30cb542 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,5 @@
{
"pages": [
-
{
"path" : "pages/home/home",
"style" :
@@ -73,13 +72,6 @@
"navigationBarTitleText" : ""
}
},
- {
- "path" : "pages/Shopping-cart/address/address",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
{
"path" : "pages/order/product-close/product-close",
@@ -91,7 +83,6 @@
},
{
"path" : "pages/Shopping-cart/Phone/Phone",
-
"style" :
{
"navigationBarTitleText" : "",
@@ -127,7 +118,28 @@
}
},
{
- "path" : "pages/Shopping-cart/ReceivingInformation/ReceivingInformation",
+ "path" : "pages/Shopping-cart/newaddress_Info/newaddress_Info",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/Shopping-cart/address/address",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/order/product-waitpay/product-waitpay",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/order/paysuccess/paysuccess",
"style" :
{
"navigationBarTitleText" : ""
@@ -144,6 +156,7 @@
}
},
"tabBar": {
+ "backgroundColor": "#F7E7C6",
"list": [
{
"pagePath": "pages/home/home",
diff --git a/pages/Shopping-cart/address/address.vue b/pages/Shopping-cart/address/address.vue
index 808f00d..5f14f11 100644
--- a/pages/Shopping-cart/address/address.vue
+++ b/pages/Shopping-cart/address/address.vue
@@ -1,11 +1,11 @@
-
+
- 张三
- 15888610253
+ {{ item.name }}
+ {{ item.phone }}
默认
@@ -13,27 +13,78 @@
- 黑龙江省哈尔滨市呼兰区 学院路街道288号哈
- 尔华德学院
+ {{ item.address }}
+
- 新增地址
+ 新增地址
-
diff --git a/pages/order/product-waitpay/img/add.png b/pages/order/product-waitpay/img/add.png
new file mode 100644
index 0000000..0b3310f
Binary files /dev/null and b/pages/order/product-waitpay/img/add.png differ
diff --git a/pages/order/product-waitpay/img/dingwei.png b/pages/order/product-waitpay/img/dingwei.png
new file mode 100644
index 0000000..f09812a
Binary files /dev/null and b/pages/order/product-waitpay/img/dingwei.png differ
diff --git a/pages/order/product-waitpay/img/product.png b/pages/order/product-waitpay/img/product.png
new file mode 100644
index 0000000..f7b1566
Binary files /dev/null and b/pages/order/product-waitpay/img/product.png differ
diff --git a/pages/order/product-waitpay/img/rmb_32.png b/pages/order/product-waitpay/img/rmb_32.png
new file mode 100644
index 0000000..015faa7
Binary files /dev/null and b/pages/order/product-waitpay/img/rmb_32.png differ
diff --git a/pages/order/product-waitpay/img/rmb_36px.png b/pages/order/product-waitpay/img/rmb_36px.png
new file mode 100644
index 0000000..60e9daf
Binary files /dev/null and b/pages/order/product-waitpay/img/rmb_36px.png differ
diff --git a/pages/order/product-waitpay/img/rmb_cheng.png b/pages/order/product-waitpay/img/rmb_cheng.png
new file mode 100644
index 0000000..b176eea
Binary files /dev/null and b/pages/order/product-waitpay/img/rmb_cheng.png differ
diff --git a/pages/order/product-waitpay/img/rmb_huang.png b/pages/order/product-waitpay/img/rmb_huang.png
new file mode 100644
index 0000000..a780003
Binary files /dev/null and b/pages/order/product-waitpay/img/rmb_huang.png differ
diff --git a/pages/order/product-waitpay/img/short.png b/pages/order/product-waitpay/img/short.png
new file mode 100644
index 0000000..51481c5
Binary files /dev/null and b/pages/order/product-waitpay/img/short.png differ
diff --git a/pages/order/product-waitpay/img/yiwen.png b/pages/order/product-waitpay/img/yiwen.png
new file mode 100644
index 0000000..654306a
Binary files /dev/null and b/pages/order/product-waitpay/img/yiwen.png differ
diff --git a/pages/order/product-waitpay/img/you_cheng.png b/pages/order/product-waitpay/img/you_cheng.png
new file mode 100644
index 0000000..96adf0d
Binary files /dev/null and b/pages/order/product-waitpay/img/you_cheng.png differ
diff --git a/pages/order/product-waitpay/img/you_hei.png b/pages/order/product-waitpay/img/you_hei.png
new file mode 100644
index 0000000..871a146
Binary files /dev/null and b/pages/order/product-waitpay/img/you_hei.png differ
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
new file mode 100644
index 0000000..cacf573
--- /dev/null
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -0,0 +1,547 @@
+
+
+
+
+
+
+
+ {{ address.address }}
+
+
+ {{ address.detail }}
+
+
+
+
+ 更换地址
+
+
+
+ {{ address.name }}
+ {{ address.phone }}
+
+
+
+
+
+
+
+ {{ item.product_name }}
+ 【{{ item.product_type }}】
+
+ 已选种类:{{ item.selected_style }}
+
+
+ #{{ item.tag[0] }}
+
+
+ #{{ item.tag[1] }}
+
+
+ #{{ item.tag[2] }}
+
+
+
+
+
+
+ {{ item.product_price }}
+
+ .00
+
+
+
+
+ 1
+
+
+
+
+
+
+ 注:购买商品均视为同意
+ 用户须知
+
+
+
+
+
+
+
+ 商品总价
+ 共{{ num }}件商品
+
+
+
+ 138.00
+
+
+
+
+ 优惠券
+
+
+ {{ youhuijuan_num }}张优惠券可用
+
+
+
+
+ 满{{ manjian }}减{{ manjian1 }}优惠
+
+
+ 减
+ {{ manjian1 }}.00
+
+
+
+ 合计
+
+
+ {{ sumprice }}.00
+
+
+
+
+
+
+ 订单备注
+
+
+
+
+
+
+
+ 应付:
+ {{ sumprice }}.
+ 00
+
+ 微信支付
+
+
+
+
+
+
+
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index 9e6bb71..1849696 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -109,7 +109,7 @@
加入购物车
-
+
立即购买
@@ -133,6 +133,11 @@
const product_name = ref('琉璃发簪新手体验包')
const detail = ref('琉璃发簪便是汉代美人常常佩戴的发饰之一。琉璃发簪不仅美观大方,还有 着深厚的文化底蕴。购买体验包,即可体验古代文化。')
const arr_tag = ref(['发簪','送亲友','体验包','友情'])
+ const jump_buy =()=> {
+ uni.navigateTo({
+ url: '../../../pages/order/product-waitpay/product-waitpay'
+ })
+ }