diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index aef3d18..feae039 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -77,11 +77,11 @@
.tabbar-box {
height: 120rpx;
padding-bottom: env(safe-area-inset-bottom);
-
+ background-color: #fff;
.tabbar {
position: fixed;
width: 750rpx;
- background-color: #fff;
+ background-color: red;
display: flex;
justify-content: center;
align-items: center;
diff --git a/manifest.json b/manifest.json
index 6c3b6b1..3d12310 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wxe7ae8cbe1673834c",
+ "appid" : "wx94a640f07969d6c9",
"setting" : {
"urlCheck" : false
},
diff --git a/pages.json b/pages.json
index db5c8ae..5a1f6f1 100644
--- a/pages.json
+++ b/pages.json
@@ -133,6 +133,9 @@
{
"path": "mine/updateUser"
},
+ {
+ "path": "mine/team"
+ },
{
"path": "order/instantGift"
},
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index a6d01c3..c65aefc 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -1,7 +1,7 @@
- {{ isManaged ? '退出管理' : '管理' }}
+ {{ isManaged ? '退出管理' : '管理' }}
@@ -194,7 +194,8 @@ export default {
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9b3041e..02341e8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,7 +21,7 @@
+ @tap="$utils.navigateTo(`/pages/index/category?cid=${item.id}`)">
@@ -41,7 +41,7 @@
-->
+ @tap="$utils.navigateTo(`/pages_order/home/journalism`)">
@@ -52,7 +52,7 @@
-->
{{ item.title }}
@@ -83,7 +83,7 @@
推荐宝贝
- 更多
diff --git a/pages/index/member.vue b/pages/index/member.vue
index 05ff505..9087302 100644
--- a/pages/index/member.vue
+++ b/pages/index/member.vue
@@ -32,12 +32,12 @@
v-if="userInfo.isPay">
已成为会员,
去购买
+ @tap="$utils.navigateTo('/pages/index/category')">去购买
+ @tap="submitOpen">
开通会员
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 0e366e0..da9286e 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -14,7 +14,7 @@
+ @tap="clickTabs" />
@@ -23,7 +23,7 @@
{{ meal.name }}
本单佣金合计: ¥{{meal.price}}
-
+
@@ -31,7 +31,7 @@
+ @pay="handlePayOrder" @tap="goToOrderDetail(order)" />
@@ -40,7 +40,7 @@
@@ -26,7 +26,7 @@
+ @tap="qux">
取消登录
@@ -45,10 +45,10 @@
style="margin-top: 6rpx;"
>
- 阅读并同意我们的《服务协议与隐私条款》以及《个人信息保护指引》
+ 阅读并同意我们的《服务协议与隐私条款》以及《个人信息保护指引》
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index 0db37e1..04c3aae 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -57,7 +57,7 @@
-
+
确认
diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue
index 03461a7..e496df1 100644
--- a/pages_order/components/address/addressList.vue
+++ b/pages_order/components/address/addressList.vue
@@ -3,7 +3,7 @@
-
+
@@ -31,12 +31,12 @@
- 编辑
+ 编辑
- 删除
+ 删除
diff --git a/pages_order/location/pickupPoint.vue b/pages_order/location/pickupPoint.vue
index 94988e5..76b2ea9 100644
--- a/pages_order/location/pickupPoint.vue
+++ b/pages_order/location/pickupPoint.vue
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/pages_order/mine/oldUpdateUser.vue b/pages_order/mine/oldUpdateUser.vue
new file mode 100644
index 0000000..aeab029
--- /dev/null
+++ b/pages_order/mine/oldUpdateUser.vue
@@ -0,0 +1,304 @@
+
+
+
+
+
+
+ 定制自己的形象
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/mine/team.vue b/pages_order/mine/team.vue
new file mode 100644
index 0000000..64a3343
--- /dev/null
+++ b/pages_order/mine/team.vue
@@ -0,0 +1,335 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 送餐点照片
+
+
+
+ +
+ 添加图片
+
+
+
+
+
+
+ 送餐点信息
+
+
+
+ 送餐点名称
+
+
+
+
+ 您的姓名
+
+
+
+
+ 联系手机号
+
+
+
+
+ 所在地区
+
+ {{ formData.region || '请选择' }}
+
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+
+
+ 提交申请
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/mine/updateUser.vue b/pages_order/mine/updateUser.vue
index fd93354..bee7ddb 100644
--- a/pages_order/mine/updateUser.vue
+++ b/pages_order/mine/updateUser.vue
@@ -1,319 +1,282 @@
-
-
-
-
-
- 定制自己的形象
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 基本资料
+
+
+
+
+
+ 点击更换头像
+
+
+
+
+
+ 昵称
+
+
+
+
+ 手机号
+
+
+
+
+
+
+ 保存
- -->
-
-
-
-
-
-
-
-
-
- 确认
\ No newline at end of file
diff --git a/pages_order/order/afterSale.vue b/pages_order/order/afterSale.vue
index d6c818e..8ba6787 100644
--- a/pages_order/order/afterSale.vue
+++ b/pages_order/order/afterSale.vue
@@ -27,12 +27,12 @@
-
+
-
+
添加图片
@@ -53,7 +53,7 @@
-
+
提交
diff --git a/pages_order/order/newOrderDetail.vue b/pages_order/order/newOrderDetail.vue
index a15e874..16ecd5c 100644
--- a/pages_order/order/newOrderDetail.vue
+++ b/pages_order/order/newOrderDetail.vue
@@ -42,7 +42,7 @@
×{{food.count}}
-
+
{{showAllFoods ? '收起' : '展开'}} (共{{orderDetail.foodCount}}个)
@@ -115,8 +115,8 @@
共{{orderDetail.foodCount}}个,合计
¥{{(orderDetail.totalPrice - 2).toFixed(1)}}
- 立即下单
- 立即取餐
+ 立即下单
+ 立即取餐
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index 12ce70b..5fced67 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -117,7 +117,7 @@
-
+
服务技师
-->
@@ -126,11 +126,11 @@
{{order.name}} {{order.phone}}
- 复制
+ 复制
{{order.address}} {{order.addressDetails}}
- 复制
+ 复制
diff --git a/static/js/mockUserInfo.js b/static/js/mockUserInfo.js
new file mode 100644
index 0000000..0052853
--- /dev/null
+++ b/static/js/mockUserInfo.js
@@ -0,0 +1,11 @@
+export const mockUserInfo = {
+ avatarUrl: "/static/image/中森明菜.webp",
+ nickName: "李向西",
+ userId: "123456",
+ role: "团长",
+ waitingPayCount: 2,
+ waitingDiningCount: 0,
+ deliveringCount: 3,
+ pickupCount: 0,
+ completedCount: 0
+}
\ No newline at end of file