From eafb486a35fd545a76fb270923a8fe3b278ce611 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Tue, 26 Dec 2023 16:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E3=80=81?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/common/protocol/privacy.vue | 199 +++++++++++++++++++++++++ pages/common/protocol/protocol.vue | 226 +++++++++++++++++++++++++++-- pages/index/feedBack.vue | 131 +++++++++++++++++ pages/index/index.vue | 42 +++--- pages/inventory/goodsList1.vue | 4 +- pages/login/login.vue | 55 +++++-- 6 files changed, 608 insertions(+), 49 deletions(-) create mode 100644 pages/common/protocol/privacy.vue create mode 100644 pages/index/feedBack.vue diff --git a/pages/common/protocol/privacy.vue b/pages/common/protocol/privacy.vue new file mode 100644 index 0000000..6c4d0dc --- /dev/null +++ b/pages/common/protocol/privacy.vue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file diff --git a/pages/common/protocol/protocol.vue b/pages/common/protocol/protocol.vue index 5b7ef87..198f5a5 100644 --- a/pages/common/protocol/protocol.vue +++ b/pages/common/protocol/protocol.vue @@ -1,29 +1,233 @@ diff --git a/pages/index/feedBack.vue b/pages/index/feedBack.vue new file mode 100644 index 0000000..852965e --- /dev/null +++ b/pages/index/feedBack.vue @@ -0,0 +1,131 @@ + + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 0a22ebe..7a634ef 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -110,10 +110,12 @@ + arrow-direction="left"> + - @@ -186,29 +188,29 @@ val == null || undefined ? '暂无' : val return val; } - }, - // created(){ - // if (uni.getStorageSync('hiver_token')) { - // if(uni.getStorageSync('wayValue') == 1){ - // uni.reLaunch({ - // url: '/pages/other/logistics' - // }) - // }else if(uni.getStorageSync('wayValue') == 2){ - // uni.reLaunch({ - // url: '/pages/other/custom' - // }) - // } - - // } + }, + // created(){ + // if (uni.getStorageSync('hiver_token')) { + // if(uni.getStorageSync('wayValue') == 1){ + // uni.reLaunch({ + // url: '/pages/other/logistics' + // }) + // }else if(uni.getStorageSync('wayValue') == 2){ + // uni.reLaunch({ + // url: '/pages/other/custom' + // }) + // } + + // } // }, onShow() { this.shopName = uni.getStorageSync('shopName') this.type = uni.getStorageSync('type') }, - onLoad() { - this.getSaleInfo() - this.getServerData(); - this.getOrderInfoList(); + onLoad() { + this.getSaleInfo() + this.getServerData(); + this.getOrderInfoList(); this.getWaitCount() }, methods: { diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index 00f12d6..f406475 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -40,7 +40,7 @@