From dc9e241d64713f3958e09153f58fd9e3fb421815 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 29 Nov 2024 14:33:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 58 +++-
api/api.js | 64 +++-
api/http.js | 5 +-
components/home/greetComponents.vue | 21 +-
config.js | 6 +-
manifest.json | 2 +-
pages.json | 72 +----
pages/index/article.vue | 78 +++++
pages/index/center.vue | 420 --------------------------
pages/index/greet.vue | 40 ---
pages/index/home.vue | 221 ++++++++++++--
pages/index/index.vue | 415 ++-----------------------
pages/index/reservationSuccess.vue | 74 +++++
pages_order/auth/wxLogin.vue | 38 ++-
pages_order/auth/wxUserInfo.vue | 39 ++-
pages_order/info/appoint.vue | 215 +++++++++----
pages_order/info/appointDate.vue | 2 +-
pages_order/info/chooseArea.vue | 7 +-
pages_order/info/fillInfo.vue | 67 +++-
pages_order/info/greet.vue | 33 +-
pages_order/info/infoPages.vue | 9 +-
pages_order/info/isAdult.vue | 11 +-
pages_order/static/info/{下拉.png => a.png} | Bin
static/image/bg/1.png | Bin 0 -> 263784 bytes
static/image/bg/2.png | Bin 0 -> 293525 bytes
static/image/bg/3.png | Bin 0 -> 35219 bytes
static/image/bg/4.png | Bin 0 -> 66858 bytes
static/image/cart/1.png | Bin 1933 -> 0 bytes
static/image/cart/2.png | Bin 5540 -> 0 bytes
static/image/center/1.png | Bin 1215 -> 0 bytes
static/image/center/10.png | Bin 45856 -> 0 bytes
static/image/center/11.svg | 1 -
static/image/center/2.png | Bin 6235 -> 0 bytes
static/image/center/3.png | Bin 6082 -> 0 bytes
static/image/center/4.png | Bin 1783 -> 0 bytes
static/image/center/5.png | Bin 2887 -> 0 bytes
static/image/center/6.png | Bin 2123 -> 0 bytes
static/image/center/7.png | Bin 2439 -> 0 bytes
static/image/center/8.png | Bin 2576 -> 0 bytes
static/image/center/9.png | Bin 2167 -> 0 bytes
static/image/home/0.png | Bin 14285 -> 0 bytes
static/image/home/1.png | Bin 13719 -> 0 bytes
static/image/home/2.png | Bin 12604 -> 0 bytes
static/image/home/3.png | Bin 11689 -> 0 bytes
static/image/home/address-icon.png | Bin 1407 -> 0 bytes
static/image/home/arrow-icon.png | Bin 296 -> 0 bytes
static/image/home/search-icon.png | Bin 1873 -> 0 bytes
static/image/product/favorable.png | Bin 282 -> 0 bytes
static/image/tabbar/cart-a.png | Bin 958 -> 0 bytes
static/image/tabbar/cart.png | Bin 953 -> 0 bytes
static/image/tabbar/category-a.png | Bin 1139 -> 0 bytes
static/image/tabbar/category.png | Bin 1183 -> 0 bytes
static/image/tabbar/center-a.png | Bin 915 -> 0 bytes
static/image/tabbar/center.png | Bin 937 -> 0 bytes
static/image/tabbar/home-a.png | Bin 2280 -> 0 bytes
static/image/tabbar/home.png | Bin 2208 -> 0 bytes
static/image/tabbar/order-a.png | Bin 691 -> 0 bytes
static/image/tabbar/order.png | Bin 736 -> 0 bytes
store/store.js | 72 ++++-
uni.scss | 2 +-
utils/oss-upload/oss/index.js | 10 -
utils/oss-upload/oss/web.js | 2 +-
utils/utils.js | 46 ++-
63 files changed, 893 insertions(+), 1137 deletions(-)
create mode 100644 pages/index/article.vue
delete mode 100644 pages/index/center.vue
delete mode 100644 pages/index/greet.vue
create mode 100644 pages/index/reservationSuccess.vue
rename pages_order/static/info/{下拉.png => a.png} (100%)
create mode 100644 static/image/bg/1.png
create mode 100644 static/image/bg/2.png
create mode 100644 static/image/bg/3.png
create mode 100644 static/image/bg/4.png
delete mode 100644 static/image/cart/1.png
delete mode 100644 static/image/cart/2.png
delete mode 100644 static/image/center/1.png
delete mode 100644 static/image/center/10.png
delete mode 100644 static/image/center/11.svg
delete mode 100644 static/image/center/2.png
delete mode 100644 static/image/center/3.png
delete mode 100644 static/image/center/4.png
delete mode 100644 static/image/center/5.png
delete mode 100644 static/image/center/6.png
delete mode 100644 static/image/center/7.png
delete mode 100644 static/image/center/8.png
delete mode 100644 static/image/center/9.png
delete mode 100644 static/image/home/0.png
delete mode 100644 static/image/home/1.png
delete mode 100644 static/image/home/2.png
delete mode 100644 static/image/home/3.png
delete mode 100644 static/image/home/address-icon.png
delete mode 100644 static/image/home/arrow-icon.png
delete mode 100644 static/image/home/search-icon.png
delete mode 100644 static/image/product/favorable.png
delete mode 100644 static/image/tabbar/cart-a.png
delete mode 100644 static/image/tabbar/cart.png
delete mode 100644 static/image/tabbar/category-a.png
delete mode 100644 static/image/tabbar/category.png
delete mode 100644 static/image/tabbar/center-a.png
delete mode 100644 static/image/tabbar/center.png
delete mode 100644 static/image/tabbar/home-a.png
delete mode 100644 static/image/tabbar/home.png
delete mode 100644 static/image/tabbar/order-a.png
delete mode 100644 static/image/tabbar/order.png
diff --git a/App.vue b/App.vue
index ef904c8..b55ca78 100644
--- a/App.vue
+++ b/App.vue
@@ -2,13 +2,16 @@
export default {
onLaunch: function() {},
onShow: function() {
- // this.$store.commit('initConfig')
+ this.$store.commit('initConfig')
+ this.$store.commit('getBanner')
+ this.$store.commit('getArticleList')
+ this.$store.commit('getProblemList')
},
onHide: function() {}
}
-
\ No newline at end of file
diff --git a/config.js b/config.js
index bc0bb92..4befc4c 100644
--- a/config.js
+++ b/config.js
@@ -7,16 +7,16 @@ import uvUI from '@/uni_modules/uv-ui-tools'
Vue.use(uvUI);
// 当前环境
-const type = 'dev'
+const type = 'prod'
// 环境配置
const config = {
dev : {
- baseUrl : 'http://www.gcosc.fun:82',
+ baseUrl : 'http://h5.xzaiyp.top/answer-api',
},
prod : {
- baseUrl : 'http://xxx.xxx.xxx/xxx',
+ baseUrl : 'https://admin.geniusjourneyclub.com/answer-api',
}
}
diff --git a/manifest.json b/manifest.json
index ea42a21..b95552a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wxe7ae8cbe1673834c",
+ "appid" : "wxd83c5228fffa1b58",
"setting" : {
"urlCheck" : false
},
diff --git a/pages.json b/pages.json
index b42e356..74c6ba1 100644
--- a/pages.json
+++ b/pages.json
@@ -1,27 +1,19 @@
{
- "pages": [{
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": ""
- }
- },
+ "pages": [
{
- "path": "pages/index/order",
+ "path": "pages/index/index",
"style": {
"navigationBarTitleText": ""
}
},
{
- "path": "pages/index/center",
+ "path": "pages/index/home",
"style": {
"navigationBarTitleText": ""
}
},
{
- "path": "pages/index/home",
- "style": {
- "navigationBarTitleText": ""
- }
+ "path": "pages/index/article"
}
],
"preloadRule": {
@@ -32,24 +24,7 @@
},
"subPackages": [{
"root": "pages_order",
- "pages": [{
- "path": "order/orderDetail"
- },
- {
- "path": "mine/purse"
- },
- {
- "path": "mine/runningWater"
- },
- {
- "path": "mine/address"
- },
- {
- "path": "product/productDetail"
- },
- {
- "path": "order/refundsOrExchange"
- },
+ "pages": [
{
"path": "auth/wxLogin"
},
@@ -57,43 +32,10 @@
"path": "auth/wxUserInfo"
},
{
- "path": "auth/loginAndRegisterAndForgetPassword"
- },
- {
- "path": "info/chooseArea"
- },
- {
- "path": "info/isAdult"
- },
- {
- "path": "info/fillInfo"
- },
- {
- "path": "info/greet"
- },
- {
- "path": "info/startTest"
- },
- {
- "path": "info/infoPages"
- },
- {
- "path": "info/appointDate"
- },
- {
- "path" : "info/feedback"
- },
- {
- "path" : "info/start"
- },
- {
- "path" : "info/experience"
- },
- {
- "path" : "info/comment"
+ "path" : "info/appoint"
},
{
- "path" : "info/appoint"
+ "path" : "info/fillInfo"
}
]
}],
diff --git a/pages/index/article.vue b/pages/index/article.vue
new file mode 100644
index 0000000..93fc960
--- /dev/null
+++ b/pages/index/article.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下一页
+
+ {{ configList.bg_title }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/center.vue b/pages/index/center.vue
deleted file mode 100644
index bb528c3..0000000
--- a/pages/index/center.vue
+++ /dev/null
@@ -1,420 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 倾心.
-
-
-
- 今天是您来的的第32天
-
-
-
- 角色切换
-
-
-
-
-
-
-
-
-
-
-
- 我的用户
-
-
-
-
- 客户:王生
-
-
- 剩余水洗布:198
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 余额¥3000
-
-
-
-
-
-
-
- 押金¥30000
-
-
-
-
-
- 常用功能
-
-
-
-
-
- 地址管理
-
-
-
-
- 订单管理
-
-
-
-
- 换货
-
-
-
-
- 退货
-
-
-
-
-
-
-
-
- 联系客服
-
-
-
-
- 我的租赁
-
-
-
-
- 租赁车
-
-
-
-
- 申请成为水洗店
-
-
-
-
-
-
-
-
-
- 联系客服
- 确定拨打客服电话?
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/index/greet.vue b/pages/index/greet.vue
deleted file mode 100644
index 4ff591f..0000000
--- a/pages/index/greet.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- 欢迎
- Christine
-
- 来到百富门的世界
- 品味传承与创新交织的威士忌艺术
- 开启您的专属品鉴之旅
-
-
-
- 点击进入
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/index/home.vue b/pages/index/home.vue
index e5ac677..9c46004 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -1,37 +1,154 @@
-
- 您是否有品鉴威士忌的习惯?
- 是
- 否
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+ 请选择您所在的区域
+
+
+
+
+ {{ address.province}}
+
+ 省
+
+ {{ address.city}}
+
+ 市
+
+ {{ address.district}}
+
+ 区
+
+
+
+
+
+
+
+
+
+
+ 下一题
+
+
+
+ 提交
- 欢快无限饮 饮酒有限度
+
+ {{ configList.bg_title }}
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dc9e069..9853519 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,412 +1,57 @@
-
-
-
-
-
-
-
-
- {{ area }}
-
- |
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
-
-
-
-
-
-
- 我的客户
-
-
- {{ 30 }}
-
-
-
-
-
-
+
+ 欢迎
+ Christine
+
+ 来到百富门的世界
+ 品味传承与创新交织的威士忌艺术
+ 开启您的专属品鉴之旅
-
-
-
-
-
-
-
-
-
-
- HOUS水洗店
-
-
-
- 桌布水洗
-
-
- 桌布租赁
-
-
-
- 9:00-18:00
-
-
- 长沙市天心区桂花坪街道231号
-
-
-
-
- 我要水洗
-
+
+
+ 点击进入
-
-
- 关联门店:主信门店
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/pages/index/reservationSuccess.vue b/pages/index/reservationSuccess.vue
new file mode 100644
index 0000000..46bfa65
--- /dev/null
+++ b/pages/index/reservationSuccess.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下一页
+
+ {{ configList.bg_title }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 0b21dc6..83bd15e 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -1,11 +1,11 @@
-
-
+
- 答题小程序
+ {{ configList.logo_name }}
@@ -61,6 +61,7 @@
\ No newline at end of file
diff --git a/pages_order/info/appointDate.vue b/pages_order/info/appointDate.vue
index 02dde70..21bb338 100644
--- a/pages_order/info/appointDate.vue
+++ b/pages_order/info/appointDate.vue
@@ -31,7 +31,7 @@
先生
-
+
先生
diff --git a/pages_order/info/chooseArea.vue b/pages_order/info/chooseArea.vue
index 81602eb..4b13e90 100644
--- a/pages_order/info/chooseArea.vue
+++ b/pages_order/info/chooseArea.vue
@@ -1,5 +1,10 @@
+
+
+
请选择您所在的区域
@@ -21,7 +26,7 @@
},
methods: {
next() {
- uni.navigateTo({
+ uni.redirectTo({
url: '/pages_order/info/isAdult'
})
}
diff --git a/pages_order/info/fillInfo.vue b/pages_order/info/fillInfo.vue
index ff09793..e89c239 100644
--- a/pages_order/info/fillInfo.vue
+++ b/pages_order/info/fillInfo.vue
@@ -1,59 +1,98 @@
-
+
+
+
+
+
为了给您提供更个性化的服务
请您填写以下基本信息
-
+
您的姓名:
-
+
手机号码:
-
+
+
+
+
+
确认
- 欢快无限饮 饮酒有限度
+ {{ configList.bg_title }}
+
\ No newline at end of file
diff --git a/pages_order/info/isAdult.vue b/pages_order/info/isAdult.vue
index 626ac72..c07c530 100644
--- a/pages_order/info/isAdult.vue
+++ b/pages_order/info/isAdult.vue
@@ -1,6 +1,12 @@
-
+
+
+
+
+
Genius Journey Club
欢迎您的到来
使用小程序请确认您已满18周岁
@@ -41,7 +47,7 @@
},
start() {
if (this.isActive && this.isCheck) {
- uni.navigateTo({
+ uni.redirectTo({
url:'/pages_order/info/fillInfo'
})
} else {
@@ -58,7 +64,6 @@