From 0e407ece6a4c46d7851c277a738ec0860ad529b5 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 7 May 2024 17:31:34 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                           |  4 ++--
 pages.json                              |  2 +-
 pages/store/applicationRecord/index.vue | 21 ++++++++++++++++++++-
 pages/store/settled/index.vue           | 12 ++++++++----
 pages/user/subnvue/index.nvue           | 14 +++++++++-----
 pages/users/order_list/index.vue        |  3 +++
 utils/uniMP.js                          | 14 ++++++++++++++
 7 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/manifest.json b/manifest.json
index c94f62d..76c5aba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
 	"name": "惠农生活",
 	"appid": "__UNI__3A527D1",
 	"description": "",
-	"versionName": "2.0.48",
-	"versionCode": 2048,
+	"versionName": "2.0.50",
+	"versionCode": 2050,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {
diff --git a/pages.json b/pages.json
index 631b7b2..a563ac8 100644
--- a/pages.json
+++ b/pages.json
@@ -863,7 +863,7 @@
 					"style": {
 						"navigationBarTitleText": "商家入驻",
 						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
+						"enablePullDownRefresh": false
 					}
 				},
 				{
diff --git a/pages/store/applicationRecord/index.vue b/pages/store/applicationRecord/index.vue
index e53252e..028f5f5 100644
--- a/pages/store/applicationRecord/index.vue
+++ b/pages/store/applicationRecord/index.vue
@@ -39,6 +39,10 @@
 			</view>
 		</view>
 
+
+		<u-button v-if="showBtn" @click="openApplet" color="#3ABD40" shape="circle" text="立即发布产品"></u-button>
+
+
 		<view class="application-record" v-if="listData.length">
 			<!-- <view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
 				<view class="card-top">
@@ -78,17 +82,22 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	import {
-		getApplicationRecordList
+		getApplicationRecordList,
+		getUnimpInfo
 	} from '@/api/store.js'
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
+
+	import uniMP from '@/utils/uniMP.js';
 	export default {
 		data() {
 			return {
 				domain: HTTP_REQUEST_URL,
 				loading: false,
+				showBtn: false,
 				listData: [],
+				uniMpInfo: {},
 				pageData: {
 					page: 1,
 					limit: 10,
@@ -112,6 +121,10 @@
 			}
 		},
 		methods: {
+			openApplet() {
+				this.uniMpInfo.showToast = true
+				uniMP.loadAppletMP(this.uniMpInfo)
+			},
 			getListData() {
 				this.loading = true
 				uni.showLoading({
@@ -120,6 +133,12 @@
 				getApplicationRecordList(this.pageData).then(res => {
 					this.count = res.data.count
 					this.listData = this.listData.concat(res.data.list)
+					this.showBtn = (this.listData[this.listData.length - 1].status == 1)
+					if (this.showBtn) {
+						getUnimpInfo().then(res => {
+							this.uniMpInfo = res.data
+						})
+					}
 					uni.hideLoading();
 					this.loading = false
 				})
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 4a44e27..3b24ab3 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -168,7 +168,8 @@
 								<u-line style="margin: 28rpx 0;"></u-line>
 								<view class="card-cont-li">
 									<view class="ellipsis" style="display: flex;align-items: center;">
-										社会信用代码 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+										社会信用代码 <u--input @blur='creditCodeInput'
+											style="margin-left: 40rpx;width: 500rpx;" border="none"
 											v-model="formData.social_credit_code">
 										</u--input>
 									</view>
@@ -393,6 +394,9 @@
 			},
 			mapGetters(['isLogin', 'viewColor', 'keyColor'])),
 		methods: {
+			creditCodeInput() {
+				this.formData.social_credit_code = this.formData.social_credit_code.replace(/[\u4E00-\u9FA5]/g, '');
+			},
 			countDown() {
 				let {
 					num
@@ -415,8 +419,8 @@
 				uni.navigateBack()
 			},
 			openApplet() {
+				this.uniMpInfo.showToast = true
 				uniMP.loadAppletMP(this.uniMpInfo)
-
 			},
 			splitAddress(str) {
 				if (!str.includes('省')) str = "四川省" + str;
@@ -482,8 +486,8 @@
 					if (res.status == 200) {
 						that.formData.address = res.data.address;
 						that.formData.name = res.data.legal_person;
-						// that.formData.social_credit_code = res.data.register_number;
-						that.formData.social_credit_code = this.generateRandomNumbers(1, 10000, 99999)[0];
+						that.formData.social_credit_code = res.data.register_number;
+						// that.formData.social_credit_code = this.generateRandomNumbers(1, 10000, 99999)[0];
 						that.formData.company_name = res.data.name;
 					} else {
 						that.$util.Tips({
diff --git a/pages/user/subnvue/index.nvue b/pages/user/subnvue/index.nvue
index 96efc77..2766897 100644
--- a/pages/user/subnvue/index.nvue
+++ b/pages/user/subnvue/index.nvue
@@ -11,7 +11,7 @@
 				class="target-icon"></image>
 			<text class="target-text">商家入驻</text>
 		</view>
-		<view :style="{left:left-20,top:top-70}" class="trans1">
+		<view :style="{left:left-20+'px',top:top-70+'px'}" class="trans1">
 			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
 		</view>
 		<view class="tips-box" :style="{left:left-13.5,top:top-154}">
@@ -32,8 +32,8 @@
 	export default {
 		data() {
 			return {
-				screenHeight: 800,
-				screenWidth: 375,
+				screenHeight: 0,
+				screenWidth: 0,
 				isAct: false,
 				left: -100,
 				top: -100,
@@ -48,13 +48,17 @@
 		onLoad() {
 			let that = this
 			uni.$on('openUserSubnvue', (data) => {
-				that.left = JSON.parse(data).left
-				that.top = JSON.parse(data).top
+				console.log('data')
+				console.log(data)
+				this.left = JSON.parse(data).left
+				this.top = JSON.parse(data).top
+				console.log(this.left, this.top)
 			})
 			const res = uni.getSystemInfo({
 				success: (res => {
 					this.screenHeight = res.screenHeight
 					this.screenWidth = res.screenWidth
+
 				})
 			});
 			setTimeout(() => {
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 4b3e9e4..b1b3a42 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -523,6 +523,9 @@
 			} else {
 				toLogin()
 			}
+			if (options.sale_type) {
+				this.sale_type = options.sale_type
+			}
 		},
 
 		onReady: function() {
diff --git a/utils/uniMP.js b/utils/uniMP.js
index 630380a..df8b11b 100644
--- a/utils/uniMP.js
+++ b/utils/uniMP.js
@@ -1,3 +1,6 @@
+import {
+	Toast
+} from "../libs/uniApi";
 import {
 	getGXconfig,
 	miniapp
@@ -202,6 +205,8 @@ const loadMPurl = async (e) => {
 
 // 商城配置的小程序
 const loadAppletMP = async (data) => {
+	// console.log(data)
+	// return
 	appid = data.app_id;
 	// return ;
 	uni.$emit('showLoading', true, '初始化中');
@@ -212,6 +217,12 @@ const loadAppletMP = async (data) => {
 		} else {
 			flag = true
 		}
+		if (data.showToast) {
+			uni.showLoading({
+				title: '正在加载中...'
+			});
+		}
+
 		if (0 != ret.code || compareVersions(data.version, ret.versionInfo.name) == 1 || flag ==
 			true) {
 			let count = 0;
@@ -220,6 +231,8 @@ const loadAppletMP = async (data) => {
 					`初始化中... ${count}%`)
 				else uni.$emit('showLoading', true, `初始化中... 99%`)
 			}, 200)
+
+
 			let downloadTask = uni.downloadFile({
 				url: data.url,
 				// url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt",
@@ -326,6 +339,7 @@ const doInstallMP = (data) => {
 };
 
 const open = (id = null) => {
+	uni.hideLoading()
 	uni.$emit('showLoading', false);
 	let token = uni.getStorageSync('LOGIN_STATUS_TOKEN');
 	if (!token) return uni.showToast({