From c763a2b5f3ca0129099c8d13fe1821988f013d85 Mon Sep 17 00:00:00 2001
From: "3075067877@qq.com" <3075067877@qq.com>
Date: Sun, 7 Apr 2024 17:53:16 +0800
Subject: [PATCH] fix 12 report

---
 src/subpackage/party/js/api.js                 | 38 ++++++------
 src/subpackage/party/pages/index/index.vue     | 25 ++++++--
 src/subpackage/party/pages/login/login.vue     |  2 +-
 src/subpackage/party/pages/login/regist.vue    | 84 ++++++++++++++++++++++----
 src/subpackage/party/pages/login/reviewing.vue | 26 +++++++-
 src/subpackage/party/pages/miniapp/auth.vue    | 39 +++++++++---
 src/subpackage/party/pages/miniapp/certify.vue | 20 ++++--
 src/subpackage/party/pages/miniapp/regist.vue  | 36 ++++++++---
 src/subpackage/party/pages/miniapp/regular.vue |  8 ++-
 src/utils/util.js                              | 24 ++++++++
 10 files changed, 241 insertions(+), 61 deletions(-)

diff --git a/src/subpackage/party/js/api.js b/src/subpackage/party/js/api.js
index b28ec5b..8a02bbc 100644
--- a/src/subpackage/party/js/api.js
+++ b/src/subpackage/party/js/api.js
@@ -17,6 +17,8 @@ export const PARTY_API = {
   getOpenIdByToken: `${ORIGIN}/web/webBrandUser/getUserOpenId`, //获取openid
   bindBrand: `${ORIGIN}/admin/tryout/bindBrand`, //绑定品牌
   getVerifyMiniAppInfo: `${ORIGIN}/admin/tryout/verifyMiniAppInfo/get`, //获取转正数据
+  brandGet: `${ORIGIN}/stadium/brand/get`, //获取转正数据如get/63
+
   verifybetaweapp: `${ORIGIN}/admin/wechatTpp/mini/tryout/verifybetaweapp`, //转正
 
   bindingOpenId: `${ORIGIN}/assistant/bindingOpenId`, //改为小程序端绑定openid
@@ -33,19 +35,21 @@ export const PARTY_API = {
   editTempDraft: `${ORIGIN}/web/webBrandAuthenticationTemp/edit`, //保存草稿
   getTempDraft: `${ORIGIN}/web/webBrandAuthenticationTemp/get`, //获取草稿
 
+
+
 }
 PARTY_API['gatewayDoJson'] = {
-  getaccountbasicinfo: { "appid": "wxeb7efb9a1cbdd554", "module": "/cgi-bin/account/getaccountbasicinfo", "method": "POST", "form": {} },  // 获取账户基本信息
+  getaccountbasicinfo: { "appid": "", "module": "/cgi-bin/account/getaccountbasicinfo", "method": "POST", "form": {} },  // 获取账户基本信息
   // checkwxverifynickname: { "appid": "wxeb7efb9a1cbdd554", "module": "/cgi-bin/wxverify/checkwxverifynickname", "method": "POST", "form": { "nick_name": "修改小程序名称" } },
   // modifywxverifynickname: {"appid":"wxeb7efb9a1cbdd554","module":"/wxa/setnickname","method":"POST","form":{"nick_name":"欧轩企业管理2","id_card":"BQGH4DpbizOg3wGtGhE_uWudXRoRhnbr7K5KkJYgHQfaK1to2O-u-CkZEN5Faeak","license":""}},
-  getcategory: { "appid": "wx27f426fb3b167390", "module": "/cgi-bin/wxopen/getcategory", "method": "GET", "form": {} },
-  get_icp_entrance_info: { "appid": "wx27f426fb3b167390", "module": "/wxa/icp/get_icp_entrance_info", "method": "GET", "form": {} },
+  getcategory: { "appid": "", "module": "/cgi-bin/wxopen/getcategory", "method": "GET", "form": {} },
+  get_icp_entrance_info: { "appid": "", "module": "/wxa/icp/get_icp_entrance_info", "method": "GET", "form": {} },
 
   // 小程序改名
-  checkwxverifynickname: { "appid": "wx27f426fb3b167390", "module": "/cgi-bin/wxverify/checkwxverifynickname", "method": "POST", "form": { "nick_name": "修改小程序名称" } },
-  modifywxverifynickname: { "appid": "wxeb7efb9a1cbdd554", "module": "/wxa/setnickname", "method": "POST", "form": { "nick_name": "欧轩企业管理2", "id_card": "BQGH4DpbizOg3wGtGhE_uWudXRoRhnbr7K5KkJYgHQfaK1to2O-u-CkZEN5Faeak", "license": "" } },
+  checkwxverifynickname: { "appid": "", "module": "/cgi-bin/wxverify/checkwxverifynickname", "method": "POST", "form": { "nick_name": "修改小程序名称" } },
+  modifywxverifynickname: { "appid": "", "module": "/wxa/setnickname", "method": "POST", "form": { "nick_name": "欧轩企业管理2", "id_card": "BQGH4DpbizOg3wGtGhE_uWudXRoRhnbr7K5KkJYgHQfaK1to2O-u-CkZEN5Faeak", "license": "" } },
   setnickname: {
-    "appid": "wxeb7efb9a1cbdd554",
+    "appid": "",
     "module": "/wxa/setnickname",
     "method": "POST",
     "form": {
@@ -57,39 +61,39 @@ PARTY_API['gatewayDoJson'] = {
   getwxauthinfo: { "module": "/wxa/sec/wxaauth", "appid": "wxeb7efb9a1cbdd554" },
 
   wxauth: {//提交认证信息
-    "appid": "wxeb7efb9a1cbdd554",
+    "appid": "",
     "module": "/wxa/sec/wxaauth",
     "method": "POST",
     "form": {}
   },
   getwxauth: {//获取认证信息
-    "appid": "wxeb7efb9a1cbdd554",
+    "appid": "",
     "module": "/wxa/sec/wxaauth",
     "method": "GET",
     "form": {}
   },
   create_icp_verifytask: {//发起人身核身
-    "appid": "wxeb7efb9a1cbdd554",
+    "appid": "",
     "module": "/wxa/icp/create_icp_verifytask",
     "method": "POST", "form": {}
   },
   apply_icp_filing: { //提交ICP备案信息
-    "appid": "wxeb7efb9a1cbdd554",
+    "appid": "",
     "module": "/wxa/icp/apply_icp_filing",
     "method": "POST", "form": {}
   },
-  query_icp_certificate_types: { "appid": "wxeb7efb9a1cbdd554", "module": "/wxa/icp/query_icp_certificate_types", "method": "GET", "form": {} },
-  query_icp_subject_types: { "appid": "wxeb7efb9a1cbdd554", "module": "/wxa/icp/query_icp_subject_types", "method": "GET", "form": {} },
-  query_icp_district_code: { "appid": "wxeb7efb9a1cbdd554", "module": "/wxa/icp/query_icp_district_code", "method": "GET", "form": {} },
-  query_icp_service_content_types: { "appid": "wxeb7efb9a1cbdd554", "module": "/wxa/icp/query_icp_service_content_types", "method": "GET", "form": {} },
+  query_icp_certificate_types: { "appid": "", "module": "/wxa/icp/query_icp_certificate_types", "method": "GET", "form": {} },
+  query_icp_subject_types: { "appid": "", "module": "/wxa/icp/query_icp_subject_types", "method": "GET", "form": {} },
+  query_icp_district_code: { "appid": "", "module": "/wxa/icp/query_icp_district_code", "method": "GET", "form": {} },
+  query_icp_service_content_types: { "appid": "", "module": "/wxa/icp/query_icp_service_content_types", "method": "GET", "form": {} },
 
   // apply_icp_filing: { "appid": "wxeb7efb9a1cbdd554", "module": "/wxa/icp/apply_icp_filing", "method": "POST", "form": {} },
   
-  addcategory:{"appid":"wxeb7efb9a1cbdd554","module":"/cgi-bin/wxopen/addcategory","method":"POST","form":{"categories":[{"certicates":[],"first":0,"second":0}]}},
-  getcategory:{"appid":"wxeb7efb9a1cbdd554","module":"/cgi-bin/wxopen/getcategory","method":"GET","form":{}},
+  addcategory:{"appid":"","module":"/cgi-bin/wxopen/addcategory","method":"POST","form":{"categories":[{"certicates":[],"first":0,"second":0}]}},
+  getcategory:{"appid":"","module":"/cgi-bin/wxopen/getcategory","method":"GET","form":{}},
   
   //查询认证信息
-  queryauth: {"appid":"wxeb7efb9a1cbdd554","module":"/wxa/sec/queryauth","method":"POST","form":{"taskid":"$LAST_RESULT./wxa/sec/wxaauth.taskid"}},
+  queryauth: {"appid":"","module":"/wxa/sec/queryauth","method":"POST","form":{"taskid":"$LAST_RESULT./wxa/sec/wxaauth.taskid"}},
 
 }
 
diff --git a/src/subpackage/party/pages/index/index.vue b/src/subpackage/party/pages/index/index.vue
index 18ddd6c..0e08383 100644
--- a/src/subpackage/party/pages/index/index.vue
+++ b/src/subpackage/party/pages/index/index.vue
@@ -65,14 +65,14 @@
 				</view>
 			</view>
 
-			<view class="p-box-title b-flex-as-s b-t-B b-t-32 b-pb-20 b-ml-40 b-mt-60 b-mb-20">试用小程序</view>
+			<!-- <view class="p-box-title b-flex-as-s b-t-B b-t-32 b-pb-20 b-ml-40 b-mt-60 b-mb-20">试用小程序</view>
 			<view class="p-box b-flex-x b-flex-b b-mb-10" style="width: 670rpx;" @click="toRegular">
 				<view class="b-flex-y b-flex-c " style="width: 670rpx;">
 					<text class="b-t-white b-t-24 p-index-2 b-flex-as-s b-ml-60">去转正</text>
 					<image  class="pb-img-arrow-white b-mt-20 p-index-2 b-flex-as-s b-ml-60" src="../../static/index/p-arrow-white.png"></image>
 					<image class="pb-bg" src="../../static/index/p-bg-3.png" style="width: 670rpx;"></image>
 				</view>
-			</view>
+			</view> -->
 
 			<view class="p-box-title b-flex-as-s b-t-B b-t-32 b-pb-20 b-ml-40 b-mt-60 b-mb-20">收款账户申请（商户号）</view>
 			<view class="p-box b-flex-x b-flex-b b-mb-60" style="width: 670rpx;" @click="toShouKuan">
@@ -104,6 +104,7 @@
 		data() {
 			return {
 				appid: "",
+				brandInfo:{},//品牌信息
 				url_manager: [{
 					"url":"https://testadmin.ouxuanzhineng.cn",
 					"show":"testadmin.ouxuanzhineng.cn"
@@ -125,9 +126,12 @@
 				// AppID： wx7873af4ffca558fd  test
 			}
 		},
-		onLoad(opts) {
+		async onLoad(opts) {
 			console.log("onload-", opts)
 			this.appid = opts.appid;
+			let _brandInfo = await this.$store.dispatch('getBrandInfo');
+			console.log("_brandInfo:",_brandInfo)
+			this.brandInfo = _brandInfo
 			// if(!opts.appid){
 			// 	opts.appid = "wxc141a743225e7885"
 			// }
@@ -165,11 +169,19 @@
 			},
 			toMiniAppRegist(index){
 				let {miniapp_app_id,appid} = this
-				console.log('toMiniAppRegist',index,appid)
+				let {is_try_out} = this.brandInfo.brand.mini_wechat
+				console.log('toMiniAppRegist',index,appid,is_try_out)
+				console.log('miniapp_app信息:',this.brandInfo.brand.mini_wechat)
 				if(!appid){
 					util.routeTo(`/subpackage/party/pages/miniapp/wx_auth_select?index=${index}`,'nT');
 				}else{
-					util.routeTo(`/subpackage/party/pages/miniapp/regist?appid=${appid}`,'nT');
+					//is_try_out 需要确认一下测试小程序转正后, 是否为false. 此处为猜测.因后台不确定.
+					if(!is_try_out){
+						util.routeTo(`/subpackage/party/pages/miniapp/regist?appid=${appid}`,'nT');
+					}else{
+						util.showNone('已有待转正小程序:',appid)
+						util.routeTo(`/subpackage/party/pages/miniapp/regular`,'nT');
+					}
 				}
 			},
 			checkMiniAppRegist(){
@@ -191,6 +203,9 @@
 					console.log("checkMiniAppRegist-err", err)
 				})
 			},
+			getBrandInfoWeb(){
+				// 后台获取品牌信息接口获取试用小程序转正信息
+			},
 			toWebPage(){
 				console.log('toWebPage')
 				let url = this.getManagerUrl.url;
diff --git a/src/subpackage/party/pages/login/login.vue b/src/subpackage/party/pages/login/login.vue
index 3dad910..8e24670 100644
--- a/src/subpackage/party/pages/login/login.vue
+++ b/src/subpackage/party/pages/login/login.vue
@@ -46,7 +46,7 @@
             </view>
 
             <!-- 登录按钮 -->
-            <button @click="clickSubmitbtn" class="p-login-btn b-btn b-btn-green b-mt-60 b-mb-60" style="height: 112rpx;">登录</button>
+            <button @click="clickSubmitbtn" class="p-login-btn b-btn b-btn-green b-mt-60 b-mb-60" style="height: 112rpx;">注册</button>
        
 		</view>
 
diff --git a/src/subpackage/party/pages/login/regist.vue b/src/subpackage/party/pages/login/regist.vue
index 2fa7a4e..d98f74c 100644
--- a/src/subpackage/party/pages/login/regist.vue
+++ b/src/subpackage/party/pages/login/regist.vue
@@ -149,7 +149,7 @@
 					</view>
 					<view class="rb-input-box  rb-line b-flex-x b-flex-b">
 						<view class="rb-input-title b-flex-x">手机号<text>*</text></view>
-						<input class="rb-input"  v-model="submitData.contact_number" type="tel" placeholder="请输入手机号"
+						<input class="rb-input"  v-model="submitData.contact_number" maxlength="11" type="tel" placeholder="请输入手机号"
 							placeholder-class="input-hold-class"></input>
 					</view>
 				</view>
@@ -164,6 +164,7 @@
 
 <script>
 	import util from '@/utils/util.js';
+	import{phoneReg} from '@/utils/util.js'
 	import { getCnArea } from '../../../party/js/api';
 	// import { getCnArea } from '../../../party/js/china-area';
 
@@ -206,8 +207,8 @@
 					oper_mobile: "", //手机号
 				},
 
-
-				submitData: {
+				submitData:{} ,
+				submitDataOrigin: {
 				// qualification_type: null, // 主体类型
 				// credit_end_date: '', // 营业执照有效期，格式：2006-01-02，永久用 0 表示
 				// company_type: null, // 企业类型
@@ -219,13 +220,13 @@
 				// business_id_card: '', // 运营人员身份证号
 
 					// "business_user_code": "",//
-					"mobile": "",
-					"status": 2,
-					"update_status": 1,
-					"update_pre_web_brand_user": null,
+					"mobile": "",//手机号
+					// "status": 2,
+					// "update_status": 1,
+					// "update_pre_web_brand_user": null,
 					"brand_name": "", //品牌名称
 					"company_name": "", //企业名称
-					"business_license": "",
+					"business_license": "",//营业执照
 					"agency_code": "",//信用代码
 					"province": "",
 					"city": "",
@@ -241,7 +242,7 @@
 					"extension": {
 						"qualification_type": 1,//主体类型
 						"credit_end_date": "0", //格式：2006-01-02，永久用 0 表示
-						"company_type": 1,//企业类型
+						"company_type": 1,//企业类型 
 						"legal_person_name": "",//法人姓名
 						"registered_province_code": "",//省份编号 110000
 						"registered_city_code": "",//城市编号 110100
@@ -376,6 +377,7 @@
 			},
 		},
 		methods: {
+
 			webBrandUserGet(){
 				// util.showNone("检测是否有数据回显")
 
@@ -399,6 +401,11 @@
 							if(res.data.data)this.submitData = res.data.data
 
 							this.checkSubmitDataIsNull()
+
+							this.resetSubmitDataFromOrigin()
+
+							this.setPickerValueShow()
+
 						}else{
 							util.showNone(res.data.message)
 						}
@@ -409,6 +416,7 @@
 				})
 			},
 			checkSubmitDataIsNull(){
+				//某些情况下后台返回的数据是null,这里需要初始化
 				if(!this.submitData.extension){
 					this.submitData.extension =  {
 						"qualification_type": 1,//主体类型
@@ -423,6 +431,17 @@
 						"business_id_card_back_url":"",//运营人员身份证国徽面
 					}
 				}
+				//回显地址数据
+				let {registered_city_code,registered_province_code} = this.submitData.extension
+				let {province,city,area} = this.submitData
+				if(registered_city_code&&registered_province_code&&province&&city&&area){
+					this.areaDetail = {
+						value: [province,city,area],
+						code: [registered_province_code,registered_city_code],
+						postcode: ''
+					}
+					// this.areaValueShow = this.areaDetail.value.join('/')
+				}
 			},
 			//上传照片
 			async clickUploadLicenseImg() {
@@ -555,6 +574,19 @@
 							this.submitData.extension.credit_end_date = `${year}-${month}-${day}`
 						}
 					}
+					if(res.Response.Type){
+						let _index = ""
+						const t =  this.company_types.find((item,index) => {
+							if(item.label === res.Response.Type){
+								console.log("item.label", item.label, res.Response.Type, item.label === res.Response.Type)
+								_index = index
+								return item
+							}
+						});
+						this.submitData.extension.company_type = t.value
+						this.company_type_index = _index
+						this.company_type_show = this.company_types_arr[_index]
+					}
 				} else {
 					this.submitData.extension.business_id_card = res.Response.IdNum
 					this.submitData.contact_person  = res.Response.Name
@@ -608,16 +640,25 @@
 				total += section + number;
 				return total;
 			},
+			setPickerValueShow(){//根据回显数据初始化picker值的显示
+				console.log("setPickerValue")
+				this.qualification_type_index = this.submitData.extension.qualification_type
+				this.company_type_index = this.submitData.extension.company_type
+				this.qualification_type_show = this.qualification_types_arr[this.qualification_type_index]
+				this.company_type_show = this.company_types_arr[this.company_type_index]
+			},
 			bindPickerChange_qualification(e) {
 				console.log('bindPickerChange_qualification:', e.detail.value)
 				if(e.detail.value>1)return util.showNone("仅支持:企业或个体工商户")
 				this.qualification_type_index = e.detail.value
 				this.qualification_type_show = this.qualification_types_arr[e.detail.value]
+				this.submitData.extension.qualification_type = this.qualification_types[e.detail.value].value
 			},
 			bindPickerChange_company_types(e) {
 				console.log('bindPickerChange_company_types:', e.detail.value)
 				this.company_type_index = e.detail.value
 				this.company_type_show = this.company_types_arr[e.detail.value]
+				this.submitData.extension.company_type = this.company_types[e.detail.value].value
 			},
 			bindPickerChange_address(e) {
 				console.log('bindPickerChange_address:', JSON.stringify(e.detail))
@@ -652,7 +693,7 @@
 
 			// 提交审核
 			submitRegist() {
-				// if(!this.checkSubmitData())return
+				if(!this.checkSubmitData())return
 
 				// this.checkSubmitData()
 
@@ -686,10 +727,24 @@
 				})
 				
 			},
+			//将submitData按照submitDataOrigin的格式进行检查, 去掉不存在的字段
+			resetSubmitDataFromOrigin(){
+				let _data = JSON.parse(JSON.stringify(this.submitDataOrigin))
+				for (let key in _data) {
+					if(this.submitData[key]){
+						_data[key] = this.submitData[key]
+					}
+				}
+				this.submitData = _data
+
+			},
 			checkSubmitData(){
 				let {submitData} = this;
-				//循环submitData,检查是否有空值
+				let mobile = submitData.contact_number
 				console.log("submitData",submitData)
+				if(!mobile || !phoneReg.test(mobile))return util.showNone('请输入正确手机号码！');
+				
+				//循环submitData,检查是否有空值
 				let unInput_arr = []
 				for (let key in submitData) {
 					if (submitData[key] === '') {
@@ -697,6 +752,13 @@
 						unInput_arr.push(key)
 					}
 				}
+									// this.submitData.extension
+				for (let key in submitData.extension) {
+					if (submitData.extension[key] === '') {
+						console.log("submitData.extension key need:", key)
+						unInput_arr.push(key)
+					}
+				}
 				if(unInput_arr.length > 0){
 					console.log("unInput_arr",unInput_arr.length, unInput_arr)
 					util.showNone("请完善信息后提交")
diff --git a/src/subpackage/party/pages/login/reviewing.vue b/src/subpackage/party/pages/login/reviewing.vue
index fb2de33..89e3afa 100644
--- a/src/subpackage/party/pages/login/reviewing.vue
+++ b/src/subpackage/party/pages/login/reviewing.vue
@@ -13,10 +13,18 @@
 				<button
 					class="b-btn b-btn-green b-mt-60 b-mb-60"
 					hover-class="button-hover"
-					@click="SubmitEvent"
+					@click="changeAuditInfo"
 				>
 				修改审核资料
 				</button>
+
+				<button
+					class="b-btn b-btn-green b-mt-60 b-mb-60"
+					hover-class="button-hover"
+					@click="queryAuditResult"
+				>
+				查询审核结果
+				</button>
 		</view>
 		
 	</view>
@@ -61,6 +69,7 @@
 		},
 		methods: {
 			webBrandUserCheck(){
+				util.showLoad()
 				console.warn('webBrandUserCheck')
 				let _data = {}
 				if(uni.getStorageSync('token_web')){//后台湘宏要求: 有用户token就传用户token，没有就传验证码登录返回的那个token
@@ -77,12 +86,25 @@
 
 					this.status = res.status
 
-					
+					if(res.status == 5){//审核通过
+						util.routeTo(`/pages/index/index`,'rL')
+					}else{//后台审核通过并手动创建品牌后, status=5
+						util.showNone('审核中，请耐心等待')
+					}
+					util.hideLoad()
 				}).catch(err=>{
+					util.hideLoad()
 					console.warn('webBrandUserCheck err',err)
 					util.routeTo(`/pages/login/login`,'rL');
+
 				})
 			},
+			queryAuditResult(){
+				this.webBrandUserCheck()
+			},
+			changeAuditInfo(){
+				util.routeTo(`/subpackage/party/pages/login/regist`,'rT')
+			},
 			SubmitEvent(){
 				util.routeTo("/subpackage/party/pages/login/regist","nT")
 			}
diff --git a/src/subpackage/party/pages/miniapp/auth.vue b/src/subpackage/party/pages/miniapp/auth.vue
index 21e26ad..f8d6c8b 100644
--- a/src/subpackage/party/pages/miniapp/auth.vue
+++ b/src/subpackage/party/pages/miniapp/auth.vue
@@ -29,6 +29,24 @@
 			</view>
 		</block>
 
+		<block v-else-if="auth_step==4">
+			<view class="auth-result-view b-flex-y b-flex-c ">
+
+					<view class="txt1">体验小程序创建成功！</view>
+
+					<text class="txt2">请将点击下方按钮将小程序进行授权。</text>
+					<text class="txt2" >请勾选全部权限！</text>
+
+					<button
+						class="b-btn b-btn-green b-mt-60 b-mb-60"
+						hover-class="button-hover"
+						@click="authSuccess('123')"
+					>
+					执行绑定
+					</button>
+			</view>
+		</block>
+
 		<block v-else-if="auth_step==3">
 			<view class="r-main-view b-flex-y b-flex-c">
 				
@@ -225,24 +243,20 @@ export default {
 
 			await this.thirdPartyAuthor(party_token).then(res=>{
 				console.log('thirdPartyAuthor授权成功',res)
-				// this.authSuccess(party_token) //20240403 老板说去掉绑定bindBrand, 直接跳认证
-				this.SubmitEvent()
+				util.showNone("授权成功")
+
+				this.authSuccess(party_token) //20240403 老板说去掉绑定bindBrand, 直接跳认证
+				// this.SubmitEvent()
 			}).catch(err=>{
 				console.error('授权失败',err)
 			})
 		},
 		async authSuccess(party_token){
-			util.showNone("授权成功")
-			util.showLoad()
-			await this.bindBrand(party_token).then(res=>{
-				util.hideLoad()
+			await this.bindBrand(party_token).then(async res=>{
 				console.log(' authSuccess bindBrand',res)
-				util.showNone("绑定结果:"+res.msg||"绑定成功")
-				this.SubmitEvent()
 			}).catch(err=>{
 				console.error('authSuccess bindBrand err',err)
 				util.showNone("绑定失败")
-				util.hideLoad()
 			})
 		},
 		idTimeChange(e){
@@ -252,19 +266,24 @@ export default {
 			util.routeTo("/subpackage/party/pages/miniapp/regular","nT")
 		},
 		bindBrand(unique_id){
+			util.showLoad("品牌信息绑定中...")
 			return servers.post({
 				url: party_api.bindBrand,
 				data: {
 					unique_id,
 					brand_id: this.brandInfo.brand.id
 				},
-				failMsg: '加载数据失败！'
+				failMsg: '加载数据失败！',
+				isDefaultGet: true
 			})
 			.then(res=>{
+				util.hideLoad()
 				console.log('bindBrand',res)
+				util.showNone("绑定成功")
 				util.routeTo("/subpackage/party/pages/miniapp/regular","nT")
 				return res
 			}).catch(err=>{
+				util.hideLoad()
 				console.warn('bindBrand err',err)
 			})
 		},
diff --git a/src/subpackage/party/pages/miniapp/certify.vue b/src/subpackage/party/pages/miniapp/certify.vue
index f862a39..140993e 100644
--- a/src/subpackage/party/pages/miniapp/certify.vue
+++ b/src/subpackage/party/pages/miniapp/certify.vue
@@ -6,7 +6,7 @@
             <view class="r-box">
 				<!-- <text class="rb-title">品牌信息</text> -->
 				<view class="rb-input-box rb-line b-flex-x b-flex-b">
-					<view class="rb-input-title b-flex-x">小程序名称<text>*</text></view>
+					<view class="rb-input-title b-flex-x">账号名称<text>*</text></view>
 					<input class="rb-input" v-model="form.account_name" type="text" placeholder="请输入小程序名称"
 						placeholder-class="input-hold-class"></input>
 				</view>
@@ -203,6 +203,7 @@ export default {
 	},
 	data() {
 		return {
+			brandInfo: {},
 			appid: "",
 			localImg: {
 				1: {
@@ -262,10 +263,15 @@ export default {
 			
 		}
 	},
-	onLoad(opts) {
+	async onLoad(opts) {
 		// console.log("onload-", this.brandInfo.brand.id)
 		console.log("onload-", opts)
-		this.appid = opts.appid;
+
+		let _brandInfo = await this.$store.dispatch('getBrandInfo');
+		console.log("_brandInfo:",_brandInfo)
+		this.brandInfo = _brandInfo
+		if(opts.appid)this.appid = opts.appid;
+		if(_brandInfo.brand.mini_wechat_appid)this.appid = _brandInfo.brand.mini_wechat_appid;
 		// util.showNone("onLoad")
 		// this.getAuthInfo()
 
@@ -275,7 +281,7 @@ export default {
 
 	},
 	computed: {
-		...mapState(['brandInfo',])
+		// ...mapState(['brandInfo',])
 	},
 	watch: {
 		cartList() {
@@ -283,6 +289,11 @@ export default {
 		},
 	},
 	methods: {
+		setInfo(){
+			if(!this.form.account_name){
+				this.form.account_name = this.brandInfo.brand.mini_wechat_app_name
+			}
+		},
 		radioSelect(e){
 			console.log(e.detail)
 			this.form.invoice_info.invoice_type = e.detail.value
@@ -386,6 +397,7 @@ export default {
 				}else{
 					this.form = _res.form.auth_data
 					if(_res.localImg)this.localImg = _res.localImg
+					this.setInfo()
 
 				}
 			})
diff --git a/src/subpackage/party/pages/miniapp/regist.vue b/src/subpackage/party/pages/miniapp/regist.vue
index 2b9c2a5..21e4be5 100644
--- a/src/subpackage/party/pages/miniapp/regist.vue
+++ b/src/subpackage/party/pages/miniapp/regist.vue
@@ -46,7 +46,7 @@
 					<view class="rb-upload-list b-flex-x">
 						<view class="rb-upload-item b-flex-y b-flex-c" @click="setMiniappHeadImg">
 							<image class="rb-upload-bg" src="../../static/regist/upload_bg.png"
-							:src="appInfo.head_image_info.head_image_url"
+							:src="miniapp_pic"
 							></image>
 							<image class="rb-upload-cam" src="../../static/regist/camera.png"></image>
 							<text class="rb-input-img-text">点击上传</text>
@@ -63,7 +63,7 @@
 						<view class="b-t-B">小程序名称</view>
 						<button class="b-btn b-btn-green b-btn-sm b-mr-40" @click="clickSet(1)">设置</button>
 					</view>
-					<view class="rr-text  rb-line">{{appInfo.nickname}}</view>
+					<view class="rr-text  rb-line">{{miniapp_name}}</view>
 				</view>
 				<!-- 小程序简介 -->
 				<view class="rb-regist-box ">
@@ -73,7 +73,7 @@
 						</view>
 						<button class="b-btn b-btn-green b-btn-sm b-mr-40" @click="clickSet(2)">设置</button>
 					</view>
-					<view class="rr-text  rb-line">{{appInfo.signature_info.signature||"-"}}</view>
+					<view class="rr-text  rb-line">{{miniapp_jianjie}}</view>
 				</view>
 				<!-- 小程序类目 -->
 				<view class="rb-regist-box ">
@@ -253,7 +253,7 @@ export default {
 				"head_image_info": {
 					"head_image_url": "",
 					"modify_quota": 5,
-					"modify_used_count": 1
+					"modify_used_count": 0
 				},
 				"nickname": "",
 				"nickname_info": {
@@ -267,7 +267,7 @@ export default {
 				"registered_country": 1017,
 				"signature_info": {
 					"modify_quota": 5,
-					"modify_used_count": 1,
+					"modify_used_count": 0,
 					"signature": ""
 				},
 				"wx_verify_info": {
@@ -307,7 +307,7 @@ export default {
 			},
 			icpInfo:{},
 			nameInfo:{
-				name: "小程序名称name",
+				name: "",
 			},
 			auditList:[,"审核中","审核不通过","审核通过"],
 			categoryInfo:{
@@ -334,7 +334,8 @@ export default {
 		let _brandInfo = await this.$store.dispatch('getBrandInfo');
 		console.log("_brandInfo:",_brandInfo)
 		this.brandInfo = _brandInfo
-		this.appid = opts.appid;
+		if(opts.appid)this.appid = opts.appid;
+		if(_brandInfo.brand.mini_wechat_appid)this.appid = _brandInfo.brand.mini_wechat_appid;
 
 		this.getCurrentAppInfo() //更新小程序账户基本信息
 		this.getWebBrandUser() //更新用户信息-官网
@@ -360,6 +361,21 @@ export default {
 				return [,"审核中","审核不通过","审核通过"][status]
 			}
 		},
+		miniapp_name(){
+			// let {wx_detail} = this.brandInfo.brand.mini_wechat.extension
+			// return wx_detail.nick_name||"[未设置]"
+			return this.appInfo.nickname||"[未设置]"
+		},
+		miniapp_jianjie(){
+			// let {wx_detail} = this.brandInfo.brand.mini_wechat.extension
+			// return wx_detail.principal_name||"[未设置]"
+			return this.appInfo.signature_info.signature||"[未设置]"
+		},
+		miniapp_pic(){
+			// let {wx_detail} = this.brandInfo.brand.mini_wechat.extension
+			// return wx_detail.head_img||"../../static/regist/upload_bg.png"
+			return this.appInfo.head_image_info.head_image_url||"../../static/regist/upload_bg.png"
+		},
 	},
 	watch: {
 		// cartList() {
@@ -619,11 +635,12 @@ export default {
 		//设置简介
 		async setJianJie(txt) {
 			let data =  {
-				"appid":"wxeb7efb9a1cbdd554","module":"/cgi-bin/account/modifysignature",
+				"appid":"","module":"/cgi-bin/account/modifysignature",
 				"method":"POST",
 				"form":{"signature":""}
 			}
 			data.form.signature = txt
+			data.appid = this.appid
 			try {
 				let res = await this.gatewayDo(data);
 				// const { info } = res.data;
@@ -802,8 +819,9 @@ export default {
 			return _data
 		},
 		getCurrentAppInfo(){
-			// let appid = this.appid;
+			let appid = this.appid;
 			let _data = party_api["gatewayDoJson"].getaccountbasicinfo
+			_data.appid = appid
 			console.log("getaccountbasicinfo:",_data)
 			servers.post({
 				url: party_api.gatewayDo,
diff --git a/src/subpackage/party/pages/miniapp/regular.vue b/src/subpackage/party/pages/miniapp/regular.vue
index 4c0653f..e87b706 100644
--- a/src/subpackage/party/pages/miniapp/regular.vue
+++ b/src/subpackage/party/pages/miniapp/regular.vue
@@ -178,7 +178,7 @@ export default {
 				uni.showModal({
 					title: '提示',
 					content: msg,
-					showCancel: false,
+					showCancel: true,
 					confirmText: '知道了',
 					confirmColor: '#009874',
 					success: function (res) {
@@ -318,7 +318,11 @@ export default {
 			if(!this.verify_info.legal_persona_idcard){
 				return this.showModuleMsg('请输入法人身份证')
 			}
-			await this.showModuleMsg('请确认微信号为法人微信号!否则无法完成转正操作！')
+			// await this.showModuleMsg('请确认微信号为法人微信号!否则无法完成转正操作！')
+			let checkTip = await util.showModalMsg('请确认微信号为法人微信号!否则无法完成转正操作！').catch(err=>{
+				console.warn('checkTip err',err)
+				return false
+			})
 
 			let _data = {
 				brand_id: this.brandInfo.brand.id,
diff --git a/src/utils/util.js b/src/utils/util.js
index aad0359..163389a 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -94,6 +94,29 @@ function showModal({
   })
 }
 
+function showModalMsg(_content='加载中', _mshowCancel=true){
+  return new Promise((resolve, reject) => {
+    uni.showModal({
+      title: '提示',
+      content: _content,
+      showCancel: _mshowCancel,
+      confirmText: '确定',
+      confirmColor: '#009874',
+      success: function (res) {
+        if (res.confirm) {
+          console.log('用户点击确定');
+          resolve(true)
+        }
+      },
+      fail: function (err) {
+        console.log('用户点击取消', err);
+        reject(false)
+      }
+
+    });
+  })
+}
+
 function debounce(func, wait, immediate) {
   let timeout, args, context, timestamp, result;
   const later = function() {
@@ -384,6 +407,7 @@ export default {
   showLoad,
   hideLoad,
   showModal,
+  showModalMsg,
   debounce,
   jsonStr,
   jsonPar,