From d1366e24255f64407e9b1cf520f0a799b3e99f87 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 20 Sep 2023 14:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BC=B9=E7=AA=97=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E4=BA=A4=E6=98=93=E7=94=B3=E8=AF=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue                       |   1 +
 pages/moreProject/moreProject.vue             |  11 +-
 pages/product/basicSet.vue                    |  23 +-
 .../transactionApplication/application.vue    |   5 +-
 store/modules/app.js                          |  61 +-
 uni_modules/guyue-updater/pages/updater.vue   | 599 +++++++++---------
 6 files changed, 359 insertions(+), 341 deletions(-)

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 9f6bc78..37b9398 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -291,6 +291,7 @@
 						this.getUniMp(data);
 						break;
 					case 2:
+					
 						this.navigator(data);
 						break;
 				}
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 6273d13..52d9a18 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="gather">
-		<block v-if="isShow">
+		<block v-if="isShow&&userInfoData.mer_info.mer_name">
 			<view class="" v-if="userInfoData.mer_info.business_status==2">
 				<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
 					<view class="special_work com" v-if="true">
@@ -363,14 +363,7 @@
 			</view>
 
 		</block>
-		<!-- <m-tabbar native>
-      <template v-slot:tabbar_index_2>
-        <view class="custom_style">
-          <view class="custom_style_icon"></view>
-        </view>
-      </template>
-    </m-tabbar> -->
-		<view class="" style="padding-top: 1px;" v-if='jurisdiction==false&&isShow==false'>
+		<view class="" style="padding-top: 1px;" v-else>
 			<emptyPage title="暂无信息"></emptyPage>
 		</view>
 
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index e7e1565..b108a18 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -173,7 +173,7 @@
 
 <script>
 	import {
-		navigateBack,
+
 		Toast
 	} from '@/libs/uniApi.js'
 	import {
@@ -396,15 +396,20 @@
 				merchantUpdateAPI(data).then(res => {
 					Toast(res.message)
 					setTimeout(() => {
+						// uni.switchTab({
+						// 	url: '/pages/moreProject/moreProject',
+						// 	fail: (err) => {
+						// 		// console.log('err', err);
+						// 	}
+						// });
+						// uni.navigateTo({
+						// 	url:'/pages/moreProject/moreProject'
+						// })
+						uni.redirectTo({
+							url:'/pages/moreProject/moreProject'
+						})
 						
-						uni.switchTab({
-							url: '/pages/moreProject/moreProject',
-							fail: (err) => {
-								// console.log('err', err);
-							}
-						});
-						
-					}, 2000)
+					}, 1000)
 				}).catch(err => {
 					Toast(err)
 				})
diff --git a/pages/product/transactionApplication/application.vue b/pages/product/transactionApplication/application.vue
index 15c29c1..76ab2c2 100644
--- a/pages/product/transactionApplication/application.vue
+++ b/pages/product/transactionApplication/application.vue
@@ -11,15 +11,14 @@
 					</view>
 
 					<view class="content_title_c" v-else-if="item.status==2">
-						申请拒绝
+						已拒绝
 					</view>
 					<view class="content_title_b" v-else-if="item.status==0">
 						审核中
 					</view>
 
-
 					<view class="content_title_d">
-						{{item.type_name}}
+						{{item.mer_name}}
 					</view>
 				</view>
                  <view class="" v-if="item.fail_msg" style="margin-top: -50rpx;color: red;">
diff --git a/store/modules/app.js b/store/modules/app.js
index 057eb0e..e64d700 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -120,51 +120,38 @@ const actions = {
 		Appversion({
 			version: os.appWgtVersion,
 			type: apptype,
-			phone_brand: os.brand
+			phone_brand:os.brand
 
 		}).then((res) => {
-
+		
 			if (Object.keys(res.data.appInfo).length > 0) {
-
-				//   if(res.data.appInfo.version)	uni.showLoading({
+				// if(res.data.appInfo.version)	uni.showLoading({
 				// 	title: '检查更新中'
 				// })
-
-				if (res.data.appInfo.phone_brand.length > 0) {
-					if (plus.os.name == "Android") {
-						// 跳转安卓应用市场
-						let appurl = res.data.appInfo.dow_url //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数
-						plus.runtime.openURL(appurl)
-					} else {
-						 // 跳转AppStore
-						plus.runtime.launchApplication({
-							action: res.data.appInfo.dow_url,
-						})
-					}
-				} else {
-
-					// 版本更新
-					if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
-						compareVersions(res.data.appInfo.version,
-							wgt_v) == 1) {
-						try {
-							let info = res.data.appInfo || {};
-							let version = {
-								title: info.title || '发现新版本',
-								content: info.content || '修复了部分BUG',
-								versionName: info.version || '1.0.1',
-								downUrl: info.dow_url || '',
-								force: info.force == 1 ? true : false, // 是否强制更新
-								quiet: info.quiet == 1 ? true : false // 是否静默更新
-							}
-							Updater.update(version);
-						} catch (e) {
-							console.log(e);
+				// 版本更新
+				if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
+					compareVersions(res.data.appInfo.version,
+						wgt_v) == 1) {
+					try {
+						let info = res.data.appInfo || {};
+						let version = {
+							title: info.title || '发现新版本',
+							content: info.content || '修复了部分BUG',
+							versionName: info.version || '1.0.1',
+							
+							brand:res.data.appInfo.phone_brand,
+							downUrl: info.dow_url || '',
+							force: info.force == 1 ? true : false, // 是否强制更新
+							quiet: info.quiet == 1 ? true : false // 是否静默更新
 						}
-						// uni.hideLoading();
+						
+						Updater.update(version,res.data.appInfo);
+					} catch (e) {
+						console.log(e);
 					}
+					// uni.hideLoading();
 				}
-
+			
 			}
 		}).catch((err) => {
 			// console.log(err)
diff --git a/uni_modules/guyue-updater/pages/updater.vue b/uni_modules/guyue-updater/pages/updater.vue
index 9ca259b..fd78bde 100644
--- a/uni_modules/guyue-updater/pages/updater.vue
+++ b/uni_modules/guyue-updater/pages/updater.vue
@@ -1,315 +1,348 @@
 <template>
-  <view class="container">
+	<view class="container">
 
-    <view class="main" @click.stop="">
-      <view class="header">
-        <image src="../assets/bg1.png" class="bg1" />
-        <image src="../assets/bg2.png" class="bg2" />
-        <view class="version-title">{{ updateParams.title }}</view>
-        <view class="version-name" v-if="updateParams.versionName">V{{ updateParams.versionName }}</view>
-      </view>
-      <view class="title">更新内容：</view>
-      <view class="content" >
-        <rich-text :nodes="content" />
-      </view>
+		<view class="main" @click.stop="">
+			<view class="header">
+				<image src="../assets/bg1.png" class="bg1" />
+				<image src="../assets/bg2.png" class="bg2" />
+				<view class="version-title">{{ updateParams.title }}</view>
+				<view class="version-name" v-if="updateParams.versionName">V{{ updateParams.versionName }}</view>
+			</view>
+			<view class="title">更新内容：</view>
+			<view class="content">
+				<rich-text :nodes="content" />
+			</view>
 
-      <view class="progress" v-if="downloading">
-        <view class="slider">
-          <view class="active-slider" :style="{ width: `${progress}%` }">
-            <view class="bar" />
-            <view class="dot">
-              <view class="text">{{ progress }}%</view>
-              <view class="circle" />
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="button" :class="{'active': !downloading || downloadError}" @click="handleButton">
-        {{ downloadText }}
-      </view>
-    </view>
-    <view class="bottom" v-if="!updateParams.force" @click="back">
-      <view class="line"/>
-      <image src="../assets/close.png" class="close" />
-    </view>
-    
-  </view>
+			<view class="progress" v-if="downloading">
+				<view class="slider">
+					<view class="active-slider" :style="{ width: `${progress}%` }">
+						<view class="bar" />
+						<view class="dot">
+							<view class="text">{{ progress }}%</view>
+							<view class="circle" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="button" :class="{'active': !downloading || downloadError}" @click="handleButton">
+				{{ downloadText }}
+			</view>
+		</view>
+		<view class="bottom" v-if="!updateParams.force" @click="back">
+			<view class="line" />
+			<image src="../assets/close.png" class="close" />
+		</view>
+
+	</view>
 </template>
 
 <script>
-import { download, install } from "../updater";
+	import {
+		download,
+		install
+	} from "../updater";
 
-export default {
-  data() {
-    const data = {
-      updateParams: {},
-      progress: 0,
-      downloading: false,
-      downloadSucc: false,
-      downloadError: false,
-    };
-    return data;
-  },
-  computed: {
-    content() {
-      return (this.updateParams.content || '').replace(/[\r\n]/gim, '<br/>');
-    },
-    downloadText () {
-      if (this.downloadSucc) {
-        return this.updateParams.downSucTip;
-      }
-      if (this.downloadError) {
-        return this.updateParams.downErrorTip;
-      }
-      if (this.downloading) {
-        return this.updateParams.downMsgTip;
-      }
-      return this.updateParams.updateBtnText;
-    },
-  },
-  onLoad(params) {
-    const data = {
-      title: '发现新版本',
-      updateBtnText: '立即升级',
-      downMsgTip: '下载中，请稍后',
-      downSucTip: '下载完成，安装中',
-      downErrorTip: '下载失败，请重试',
-      quiet: false,
-      force: false,
-      ...(JSON.parse(decodeURIComponent(params.data)))
-    };
-    this.updateParams = data;
-  },
-  onBackPress() {
-    return this.updateParams.force;
-  },
-  methods: {
-    back() {
-      if (!this.updateParams.force) {
-        uni.navigateBack();
-      }
-    },
-    // 开始更新
-    start() {
-      if (!this.updateParams.downUrl) {
-        return;
-      }
+	export default {
+		data() {
+			const data = {
+				updateParams: {},
+				progress: 0,
+				downloading: false,
+				downloadSucc: false,
+				downloadError: false,
+			};
+			return data;
+		},
+		computed: {
+			content() {
+				return (this.updateParams.content || '').replace(/[\r\n]/gim, '<br/>');
+			},
+			downloadText() {
+				if (this.downloadSucc) {
+					return this.updateParams.downSucTip;
+				}
+				if (this.downloadError) {
+					return this.updateParams.downErrorTip;
+				}
+				if (this.downloading) {
+					return this.updateParams.downMsgTip;
+				}
+				return this.updateParams.updateBtnText;
+			},
+		},
+		onLoad(params) {
 
-      // ios 跳转到appstore，.apk、.wgt 直接安装更新
-      const isResource = ['.apk', '.wgt'].some(ext => this.updateParams.downUrl.toLocaleLowerCase().includes(ext));
-      if (plus.os.name !== "Android" || !isResource) {
-        plus.runtime.openURL(this.updateParams.downUrl);
-        return;
-      }
+			const data = {
+				title: '发现新版本',
+				updateBtnText: '立即升级',
+				downMsgTip: '下载中，请稍后',
+				downSucTip: '下载完成，安装中',
+				downErrorTip: '下载失败，请重试',
+				quiet: false,
+				force: false,
+				...(JSON.parse(decodeURIComponent(params.data)))
+			};
+			this.updateParams = data;
+		},
+		onBackPress() {
+			return this.updateParams.force;
+		},
+		methods: {
 
-      this.downloading = true;
-      const self = this;
+			back() {
+				if (!this.updateParams.force) {
+					uni.navigateBack();
+				}
+			},
+			// 开始更新
+			start() {
+				if (!this.updateParams.downUrl) {
+					return;
+				}
 
-      download({
-        url: self.updateParams.downUrl,
-        onProgress(progress) {
-          self.progress = progress;
-        },
-        onSuccess(filePath) {
-          self.downloadSucc = true;
-          self.downloadError = false;
-          install(filePath, true);
-        },
-        onFail() {
-          self.downloading = false;
-          self.downloadSucc = false;
-          self.downloadError = true;
-        },
-      });
-    },
-    handleButton() {
-      if (!this.downloading) {
-        return this.start();
-      }
-      if (this.downloadError) {
-        this.progress = 0;
-        this.downloading = false;
-        this.downloadSucc = false;
-        this.downloadError = true;
-        return this.start();
-      }
-    },
-  },
-};
+				// ios 跳转到appstore，.apk、.wgt 直接安装更新
+				const isResource = ['.apk', '.wgt'].some(ext => this.updateParams.downUrl.toLocaleLowerCase().includes(
+					ext));
+				if (plus.os.name !== "Android" || !isResource) {
+					plus.runtime.openURL(this.updateParams.downUrl);
+					return;
+				}
+
+				this.downloading = true;
+				const self = this;
+
+				download({
+					url: self.updateParams.downUrl,
+					onProgress(progress) {
+						self.progress = progress;
+					},
+					onSuccess(filePath) {
+						self.downloadSucc = true;
+						self.downloadError = false;
+						install(filePath, true);
+					},
+					onFail() {
+						self.downloading = false;
+						self.downloadSucc = false;
+						self.downloadError = true;
+					},
+				});
+			},
+			handleButton() {
+
+				if (this.updateParams.brand.length > 0) {
+					if (plus.os.name == "Android") {
+						// 跳转安卓应用市场
+						let appurl = this.updateParams.downUrl //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数
+						plus.runtime.openURL(appurl)
+
+						setTimeout((res) => {
+							this.back()
+						}, 1000)
+
+
+					} else {
+						// 跳转AppStore
+						plus.runtime.launchApplication({
+							action: this.updateParams.downUrl,
+						})
+						setTimeout((res) => {
+							this.back()
+						}, 1000)
+					}
+				} else {
+					if (!this.downloading) {
+						return this.start();
+					}
+					if (this.downloadError) {
+						this.progress = 0;
+						this.downloading = false;
+						this.downloadSucc = false;
+						this.downloadError = true;
+						return this.start();
+					}
+				}
+
+
+			},
+		},
+	};
 </script>
 
 <style lang="less">
-page {
-  width: 100vw;
-  height: 100vh;
-  background: transparent;
-}
+	page {
+		width: 100vw;
+		height: 100vh;
+		background: transparent;
+	}
 
-.container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.3);
-}
+	.container {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
 
-.main {
-  width: 75%;
-  background-color: #fff;
-  border-radius: 8rpx;
-  padding-bottom: 10rpx;
-}
+	.main {
+		width: 75%;
+		background-color: #fff;
+		border-radius: 8rpx;
+		padding-bottom: 10rpx;
+	}
 
-.header {
-  position: relative;
+	.header {
+		position: relative;
 
-  .bg1 {
-    width: 100%;
-    height: calc(100vw * 0.375);
-    border-top-left-radius: 8rpx;
-    border-top-right-radius: 8rpx;
-  }
+		.bg1 {
+			width: 100%;
+			height: calc(100vw * 0.375);
+			border-top-left-radius: 8rpx;
+			border-top-right-radius: 8rpx;
+		}
 
-  .bg2 {
-    position: absolute;
-    top: -40%;
-    right: 13%;
-    width: 35.9%;
-    height: calc(100vw * 0.5441);
-  }
+		.bg2 {
+			position: absolute;
+			top: -40%;
+			right: 13%;
+			width: 35.9%;
+			height: calc(100vw * 0.5441);
+		}
 
-  .version-title {
-    position: absolute;
-    top: 13%;
-    left: 8%;
-    color: #961c00;
-    font-size: 40rpx;
-  }
+		.version-title {
+			position: absolute;
+			top: 13%;
+			left: 8%;
+			color: #961c00;
+			font-size: 40rpx;
+		}
 
-  .version-name {
-    position: absolute;
-    top: 36%;
-    left: 24%;
-    background-color: #e54139;
-    color: #fff;
-    font-size: 26rpx;
-    line-height: 26rpx;
-    padding: 8rpx 20rpx;
-    border-radius: 20rpx;
-  }
-}
+		.version-name {
+			position: absolute;
+			top: 36%;
+			left: 24%;
+			background-color: #e54139;
+			color: #fff;
+			font-size: 26rpx;
+			line-height: 26rpx;
+			padding: 8rpx 20rpx;
+			border-radius: 20rpx;
+		}
+	}
 
-.title {
-  background-color: #ff6d42;
-  color: #fff;
-  display: inline-block;
-  margin-top: 12rpx;
-  margin-left: 30rpx;
-  font-size: 26rpx;
-  line-height: 26rpx;
-  padding: 8rpx 20rpx;
-  border-radius: 8rpx;
-}
+	.title {
+		background-color: #ff6d42;
+		color: #fff;
+		display: inline-block;
+		margin-top: 12rpx;
+		margin-left: 30rpx;
+		font-size: 26rpx;
+		line-height: 26rpx;
+		padding: 8rpx 20rpx;
+		border-radius: 8rpx;
+	}
 
-.content {
-  margin-top: 12rpx;
-  margin-left: 30rpx;
-  font-size: 28rpx;
-  line-height: 2;
-  max-height: 240rpx;
-  overflow-y: auto;
-}
+	.content {
+		margin-top: 12rpx;
+		margin-left: 30rpx;
+		font-size: 28rpx;
+		line-height: 2;
+		max-height: 240rpx;
+		overflow-y: auto;
+	}
 
-.button {
-  margin: 20rpx 30rpx;
-  background-color: #ffaa00;
-  color: #fff;
-  font-size: 30rpx;
-  text-align: center;
-  padding: 20rpx 0;
-  border-radius: 14rpx;
-  opacity: 0.5;
-  pointer-events: none;
+	.button {
+		margin: 20rpx 30rpx;
+		background-color: #ffaa00;
+		color: #fff;
+		font-size: 30rpx;
+		text-align: center;
+		padding: 20rpx 0;
+		border-radius: 14rpx;
+		opacity: 0.5;
+		pointer-events: none;
 
-  &:active {
-    opacity: 0.6;
-  }
-  
-  &.active {
-    opacity: 1;
-    pointer-events: initial;
-  }
-}
+		&:active {
+			opacity: 0.6;
+		}
 
-.progress {
-  padding: 50rpx 50rpx 18rpx;
+		&.active {
+			opacity: 1;
+			pointer-events: initial;
+		}
+	}
 
-  .slider {
-    position: relative;
-    width: 100%;
-    height: 10rpx;
-    border-radius: 5rpx;
-    background-color: #e2e2e2;
+	.progress {
+		padding: 50rpx 50rpx 18rpx;
 
-    .active-slider {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      position: absolute;
-      left: 0;
-      top: 0;
-      width: 0%;
-      height: 10rpx;
-      border-radius: 5rpx;
+		.slider {
+			position: relative;
+			width: 100%;
+			height: 10rpx;
+			border-radius: 5rpx;
+			background-color: #e2e2e2;
 
-      .bar {
-        flex: 1;
-        height: 100%;
-        background-color: #e84116;
-        border-top-left-radius: 5rpx;
-        border-bottom-left-radius: 5rpx;
-      }
+			.active-slider {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 0%;
+				height: 10rpx;
+				border-radius: 5rpx;
 
-      .dot {
-        position: relative;
-        margin-left: -12rpx;
+				.bar {
+					flex: 1;
+					height: 100%;
+					background-color: #e84116;
+					border-top-left-radius: 5rpx;
+					border-bottom-left-radius: 5rpx;
+				}
 
-        .text {
-          position: absolute;
-          top: -34rpx;
-          left: -50%;
-          color: #e84116;
-          font-size: 24rpx;
-          font-weight: 500;
-        }
+				.dot {
+					position: relative;
+					margin-left: -12rpx;
 
-        .circle {
-          width: 12rpx;
-          height: 12rpx;
-          border: 6rpx solid #e84116;
-          border-radius: 50%;
-          background-color: #fff;
-        }
-      }
-    }
-  }
-}
+					.text {
+						position: absolute;
+						top: -34rpx;
+						left: -50%;
+						color: #e84116;
+						font-size: 24rpx;
+						font-weight: 500;
+					}
 
-.bottom {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  .line {
-    width: 3rpx;
-    height: 50rpx;
-    background-color: #fff;
-  }
-  .close {
-    width: 64rpx;
-    height: 64rpx;
-    margin-top: -4rpx;
-  }
-}
-</style>
+					.circle {
+						width: 12rpx;
+						height: 12rpx;
+						border: 6rpx solid #e84116;
+						border-radius: 50%;
+						background-color: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.bottom {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.line {
+			width: 3rpx;
+			height: 50rpx;
+			background-color: #fff;
+		}
+
+		.close {
+			width: 64rpx;
+			height: 64rpx;
+			margin-top: -4rpx;
+		}
+	}
+</style>
\ No newline at end of file