Browse Source

1. 优化

MONSTER-ygh 1 month ago
parent
commit
77291c67f2
6 changed files with 24 additions and 42 deletions
  1. 8 8
      common/config.js
  2. 1 1
      manifest.json
  3. 6 16
      pages/index/index.vue
  4. 6 15
      pages/me/index.vue
  5. 1 1
      pages/publicSharingDetails/index.vue
  6. 2 1
      uni.scss

+ 8 - 8
common/config.js

@@ -10,7 +10,7 @@ let staticUrl= null // 静态文件地址
 let redirectUri = null
 // 本地
 // #ifdef MP
-	baseUrl='https://greath5.dev.gztjy.top/serviceapi';
+	baseUrl='https://greath5.dev.dazesoft.cn/serviceapi';
 	linkUrl='';
 	upFileUrl='';
 	staticUrl='';
@@ -18,10 +18,10 @@ let redirectUri = null
 // #endif
 // #ifdef H5
 	baseUrl='/api';
-	linkUrl='https://greath5.dev.gztjy.top/distributionlink/link.html';
+	linkUrl='https://greath5.dev.dazesoft.cn/distributionlink/link.html';
 	upFileUrl='';
-	staticUrl='https://greath5.dev.gztjy.top/distribution/static/';
-	redirectUri= 'https://greath5.dev.gztjy.top/distribution/pages/login/index'
+	staticUrl='https://greath5.dev.dazesoft.cn/distribution/static/';
+	redirectUri= 'https://greath5.dev.dazesoft.cn/distribution/pages/login/index'
 // #endif
 
 // 打包用的
@@ -33,11 +33,11 @@ if (node_dev =='development') { // 分销测试
  	staticUrl='';
  // #endif
  // #ifdef H5
- 	baseUrl='https://greath5.dev.gztjy.top/serviceapi';
-	linkUrl='https://greath5.dev.gztjy.top/distributionlink/link.html';
+ 	baseUrl='https://greath5.dev.dazesoft.cn/serviceapi';
+	linkUrl='https://greath5.dev.dazesoft.cn/distributionlink/link.html';
  	upFileUrl='h';
- 	staticUrl='https://greath5.dev.gztjy.top/distribution/static/';
-	redirectUri= 'https://greath5.dev.gztjy.top/distribution/pages/login/index'
+ 	staticUrl='https://greath5.dev.dazesoft.cn/distribution/static/';
+	redirectUri= 'https://greath5.dev.dazesoft.cn/distribution/pages/login/index'
  // #endif
 }
 if (node_dev =='production') { // 分销正式

+ 1 - 1
manifest.json

@@ -73,7 +73,7 @@
             "proxy" : {
                 "/api" : {
                     "disableHostCheck" : true,
-                    "target" : "https://greath5.dev.gztjy.top/serviceapi", //请求的目标域名
+                    "target" : "https://greath5.dev.dazesoft.cn/serviceapi", //请求的目标域名
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

+ 6 - 16
pages/index/index.vue

@@ -92,9 +92,9 @@
 				// 入网认证
 				isShowQrcode: -1, // 是否展示 推广码
 				show: false,
-				title1:'入网提示',
-				content:'你还未进行银联支付入网签约认证,请先完成签约认证!',
-				confirmText: '去认证',
+				title1:'提示',
+				content:'你的二维码已关闭!',
+				confirmText: '确认',
 			}
 		},
 		onLoad() {
@@ -192,17 +192,7 @@
 			async getRetailQrcode(){
 				try{
 					await this.getUserInfo()
-					if(this.isShowQrcode != 1) {
-						if(this.isShowQrcode == 0) {
-							this.content = '你还未进行银联支付入网签约认证,请先完成签约认证!'
-							this.confirmText = '去认证'
-						}else if(this.isShowQrcode == 2) {
-							this.content = '银联支付入网签约认证中,请耐心等待!'
-							this.confirmText = '去查看'
-						}else if(this.isShowQrcode == 3) {
-							this.content = '银联支付入网签约认证失败,请重新认证!'
-							this.confirmText = '重新认证'
-						}
+					if(this.isShowQrcode === 0) {
 						this.show = true
 					}else {
 						let res = await this.$u.api.getRetailQrcode({
@@ -227,7 +217,7 @@
 			/** 入网认证  */
 			networkConfirm() {
 				this.show = false
-				this.navigateToFun('/pages/networkAuth/index')
+				//this.navigateToFun('/pages/networkAuth/index')
 				//this.getUnionAccessUrlFun()
 			},
 			networkCancel() {
@@ -243,7 +233,7 @@
 						userid: this.distribution_user_info.userId
 					})
 					if(res && res.code ===200) {
-						this.isShowQrcode = res.data.unionFlag
+						this.isShowQrcode = res.data.qrcodeStatus
 					}
 				}catch(e){
 					//TODO handle the exception

+ 6 - 15
pages/me/index.vue

@@ -90,9 +90,9 @@
 				// 入网认证
 				isShowQrcode: -1, // 是否展示 推广码
 				show: false,
-				title1:'入网提示',
-				content:'你还未进行银联支付入网签约认证,请先完成签约认证!',
-				confirmText: '去认证',
+				title1:'提示',
+				content:'你的二维码已关闭!',
+				confirmText: '确认',
 			}
 		},
 	
@@ -124,17 +124,8 @@
 						userid: this.distribution_user_info.userId
 					})
 					this.isShowQrcode = res.data.unionFlag
-					if(this.isShowQrcode != 1) {
-						if(this.isShowQrcode == 0) {
-							this.content = '你还未进行银联支付入网签约认证,请先完成签约认证!'
-							this.confirmText = '去认证'
-						}else if(this.isShowQrcode == 2) {
-							this.content = '银联支付入网签约认证中,请耐心等待!'
-							this.confirmText = '去查看'
-						}else if(this.isShowQrcode == 3) {
-							this.content = '银联支付入网签约认证失败,请重新认证!'
-							this.confirmText = '重新认证'
-						}
+					if(this.isShowQrcode === 0) {
+						
 						this.show = true
 					}else {
 						this.getRetailQrcode()
@@ -157,7 +148,7 @@
 					})
 					if(res && res.code ===200) {
 						this.userInfo = res.data
-						this.isShowQrcode = res.data.unionFlag
+						this.isShowQrcode = res.data.qrcodeStatus
 					}
 					if(res1 && res1.code === 200){
 						this.withdrawInfo = res.data

+ 1 - 1
pages/publicSharingDetails/index.vue

@@ -21,7 +21,7 @@
 						<view>
 							<view>
 								<text>票务名称</text>
-								<text>座位类型</text>
+								<text>票档</text>
 								<text>销售价</text>
 								<text>分销价</text>
 								<text>佣金</text>

+ 2 - 1
uni.scss

@@ -17,7 +17,8 @@
 @import '@/uni_modules/uview-ui/theme.scss';
 
 /* 图片服务器地址 'https://h5.wdzzgs.com/distribution/static/' */
-$image-beas-url: 'https://greath5.dev.gztjy.top/distribution/static/';
+// $image-beas-url: 'https://greath5.dev.dazesoft.cn/distribution/static/';
+$image-beas-url: 'https://h5.wdzzgs.com/distribution/static/';
 page {
 	width: 100%;
 	height: 100%;