diff --git a/uniapp_project_code/src/App.vue b/uniapp_project_code/src/App.vue
index 25001e6..7fac56a 100644
--- a/uniapp_project_code/src/App.vue
+++ b/uniapp_project_code/src/App.vue
@@ -1,13 +1,52 @@
-
diff --git a/uniapp_project_code/src/components/index/keyboard/input_box_QR.vue b/uniapp_project_code/src/components/index/keyboard/input_box_QR.vue
index d8ea8e1..eb03d63 100644
--- a/uniapp_project_code/src/components/index/keyboard/input_box_QR.vue
+++ b/uniapp_project_code/src/components/index/keyboard/input_box_QR.vue
@@ -1,23 +1,26 @@
-
+
输入条形码
-
+
+
{{inputValue||"请输入条形码"}}
+ 查询不到该条形码商品信息, 请检查是否有误
-
+
确定
-
+
\ No newline at end of file
diff --git a/uniapp_project_code/src/components/index/keyboard/view_keyboard.vue b/uniapp_project_code/src/components/index/keyboard/view_keyboard.vue
index c2deacf..5c1be37 100644
--- a/uniapp_project_code/src/components/index/keyboard/view_keyboard.vue
+++ b/uniapp_project_code/src/components/index/keyboard/view_keyboard.vue
@@ -30,7 +30,7 @@
let activeValue = ref("") //active btn value
onMounted(async (res) => {
- console.log(res + ` the keyboard_box component is now mounted. ` + props.maskHeight)
+ // console.log(res + ` the keyboard_box component is now mounted. ` + props.maskHeight)
})
const getNumBtnClass = (i) => {
diff --git a/uniapp_project_code/src/components/index/list_item.vue b/uniapp_project_code/src/components/index/list_item.vue
new file mode 100644
index 0000000..196c1e8
--- /dev/null
+++ b/uniapp_project_code/src/components/index/list_item.vue
@@ -0,0 +1,250 @@
+
+
+
+
+
+
+
+
+ {{mitem.erp_goods?.erp_goods_name||"-"}}
+
+
+
+
+
+ {{mitem.erp_goods?.erp_goods_specs||"-"}}
+
+ ¥{{mitem.erp_goods?.erp_goods_price||"-"}}
+ ¥{{mitem.erp_goods?.erp_goods_price||"-"}}
+
+
+
+
+ {{mitem.shopCount||1}}
+
+
+
+
+ 下单得积分
+ {{mitem.score||0}}
+
+ ¥
+ {{mitem.shopCountPrice||"-"}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uniapp_project_code/src/components/index/list_item.nvue b/uniapp_project_code/src/components/index/list_item_nvue.nvue
similarity index 81%
rename from uniapp_project_code/src/components/index/list_item.nvue
rename to uniapp_project_code/src/components/index/list_item_nvue.nvue
index d973a30..4278e61 100644
--- a/uniapp_project_code/src/components/index/list_item.nvue
+++ b/uniapp_project_code/src/components/index/list_item_nvue.nvue
@@ -2,33 +2,34 @@
-
+
- 维他命柠檬茶锡兰风味250ml
-
+ {{mitem.erp_goods?.erp_goods_name||"-"}}
+
- 330ml
+
+ {{mitem.erp_goods?.erp_goods_specs||"-"}}
- ¥4.90
- ¥9.90
+ ¥{{mitem.erp_goods?.erp_goods_price||"-"}}
+ ¥{{mitem.erp_goods?.erp_goods_price||"-"}}
-
- 1
-
+
+ {{mitem.shopCount||1}}
+
下单得积分
- 50
+ {{mitem.score||0}}
¥
- 4.90
+ {{mitem.shopCountPrice||"-"}}
@@ -37,7 +38,30 @@
\ No newline at end of file
diff --git a/uniapp_project_code/src/pages/index/index.nvue b/uniapp_project_code/src/pages/index/index.nvue
deleted file mode 100644
index f3c3763..0000000
--- a/uniapp_project_code/src/pages/index/index.nvue
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
- i
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/uniapp_project_code/src/pages/index/index.vue b/uniapp_project_code/src/pages/index/index.vue
new file mode 100644
index 0000000..2f9a8c6
--- /dev/null
+++ b/uniapp_project_code/src/pages/index/index.vue
@@ -0,0 +1,461 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uniapp_project_code/src/pages/index/standby.nvue b/uniapp_project_code/src/pages/index/standby.nvue
new file mode 100644
index 0000000..d2de1e8
--- /dev/null
+++ b/uniapp_project_code/src/pages/index/standby.nvue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uniapp_project_code/src/pages/pay/index.vue b/uniapp_project_code/src/pages/pay/index.vue
index 28efc1f..ab1b8d7 100644
--- a/uniapp_project_code/src/pages/pay/index.vue
+++ b/uniapp_project_code/src/pages/pay/index.vue
@@ -1,26 +1,38 @@
-
-
+
+
+
+ @showIt="handle_closeEndPhoneBox" @clickCommit="handle_clickCommit_end_phone">
+
+
+