From 6a2a0778b43c1f4af36c60163c658b9a290b5b45 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 20 Mar 2024 17:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/product.js | 8 +-
pages.json | 10 +-
pages/index/index.vue | 20 +
pages/payment/qrcode.vue | 24 +-
pages/product/shop_type_change/index.vue | 86 +-
pages/product/shop_type_change/list.vue | 137 +++
pages/product/shop_type_change/progress.vue | 2 +-
pages/store/home/index.vue | 4 +-
pages/users/user_info/index.vue | 1130 ++++++++++---------
9 files changed, 838 insertions(+), 583 deletions(-)
create mode 100644 pages/product/shop_type_change/list.vue
diff --git a/api/product.js b/api/product.js
index 8140b48..94fb534 100644
--- a/api/product.js
+++ b/api/product.js
@@ -9,6 +9,11 @@
// +----------------------------------------------------------------------
import request from "@/utils/request.js";
+/**
+ * 获取商品详情
+ */
+export const shopTypeChange = (data) => request.post('intention/change', data)
+
/**
* 获取商品详情
*/
@@ -328,5 +333,4 @@ export function intention(data) {
*/
export function intentionbus(data) {
return request.post(`intention/business`, data);
-}
-
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index f4f5ac0..3a2a70e 100644
--- a/pages.json
+++ b/pages.json
@@ -1459,8 +1459,14 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
- },
- {
+ }, {
+ "path": "shop_type_change/list",
+ "style": {
+ "navigationBarTitleText": "申请记录",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ }, {
"path": "addGood/addGood",
"style": {
"navigationBarTitleText": "商品设置",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 21ac93e..ca76766 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -617,6 +617,10 @@
name: '收付明细',
type: 22,
image: require('@/static/images/index14.png')
+ }, {
+ name: '商户类型',
+ type: 23,
+ image: require('@/static/images/index14.png')
},
@@ -695,6 +699,10 @@
name: '收付明细',
type: 22,
image: require('@/static/images/index14.png')
+ }, {
+ name: '商户类型',
+ type: 23,
+ image: require('@/static/images/index14.png')
},
// {
// name: '全部',
@@ -741,6 +749,10 @@
name: '收付明细',
type: 22,
image: require('@/static/images/index14.png')
+ }, {
+ name: '商户类型',
+ type: 23,
+ image: require('@/static/images/index14.png')
},
{
name: '扫码付款',
@@ -1528,6 +1540,14 @@
url: '/pages/payment/payment_detail?mer_id=' + this.userInfoData.service.mer_id
})
break;
+
+ case 23:
+ if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
+ else uni.navigateTo({
+ url: '/pages/product/shop_type_change/index?mer_id=' + this.userInfoData
+ .service.mer_id
+ })
+ break;
case 17:
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
else uni.navigateTo({
diff --git a/pages/payment/qrcode.vue b/pages/payment/qrcode.vue
index d3e1554..cd3a35f 100644
--- a/pages/payment/qrcode.vue
+++ b/pages/payment/qrcode.vue
@@ -44,7 +44,17 @@
qrcode({
mer_id: merid
}).then(res => {
- this.img = res.data.url;
+ if (!res.data.count || res.data.count == 0) {
+ this.$util.Tips({
+ title: "您还没有添加商品,请添加!"
+ }, () => {
+ uni.redirectTo({
+ url: "/pages/product/addGood/addGood?mer_id=" + merid
+ })
+ })
+ } else {
+ this.img = res.data.url;
+ }
})
},
@@ -112,12 +122,10 @@
}
.v-qrcode {
- position: absolute;
- top: 400rpx;
- left: 50%;
- transform: translateX(-50%);
width: 650rpx;
height: 650rpx;
+ margin-top: 100rpx;
+ margin: 100rpx auto 0;
background-color: #fff;
display: flex;
justify-content: center;
@@ -131,16 +139,12 @@
}
.v-btn {
- position: absolute;
- top: 1080rpx;
- left: 50%;
- transform: translateX(-50%);
display: flex;
align-items: center;
justify-content: center;
width: 690rpx;
height: 100rpx;
- margin: 0 auto;
+ margin: 70rpx auto 0;
text {
font-weight: 400;
diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue
index 9d021b4..d023f0a 100644
--- a/pages/product/shop_type_change/index.vue
+++ b/pages/product/shop_type_change/index.vue
@@ -10,17 +10,22 @@
+
+ 申请记录
+
+
+
点击选择变更的商户类型
-
-
+
+
\ No newline at end of file
diff --git a/pages/product/shop_type_change/progress.vue b/pages/product/shop_type_change/progress.vue
index 0705067..e8b463c 100644
--- a/pages/product/shop_type_change/progress.vue
+++ b/pages/product/shop_type_change/progress.vue
@@ -124,7 +124,7 @@
.shop_type {
.shop_type-head {
background-color: #40AE36;
- margin-bottom: 70rpx;
+ margin-bottom: 40rpx;
.shop-type-navbar {
display: flex;
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 96e6f1b..37f673c 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1,11 +1,9 @@
-
-
@@ -1081,7 +1079,7 @@
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
} else {
this.tabs = this.tabs5
- this.type=7
+ this.type = 7
}
this.tab(this.type)
// #ifdef H5
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 961ba2f..365c231 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -1,599 +1,621 @@
-
-
-
-
+
+
+ 当前版本
+
+
+
+
+
+
+
+ 退出登录
+
+
+
+ 退出登录
+
+
+
+
+
+
\ No newline at end of file