Browse Source

Merge branch 'dev' of http://git.info666.com/tianzong/user_mobile_front into dev

sunChengjie 11 months ago
parent
commit
fb2e69c504
3 changed files with 13 additions and 9 deletions
  1. 5 1
      src/App.vue
  2. 7 7
      src/pages/express.vue
  3. 1 1
      src/pages/mailInfo.vue

+ 5 - 1
src/App.vue

@@ -22,12 +22,15 @@ export default {
 
     async created() {
         window.localStorage.setItem('scanUrl', location.href.split('#')[0])
-        const res = await getWxConfig({})
+        const res = await getWxConfig({
+            url:window.location.href
+        })
         //发送成功
         var timestamp = res.wxConfig.timestamp;
         var noncestr = res.wxConfig.nonceStr;
         var signature = res.wxConfig.signature;
         var appId = res.wxConfig.appId;
+        var url = window.location.href
         wx.config({
             debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
             // debug : true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
@@ -35,6 +38,7 @@ export default {
             timestamp: timestamp, // 必填,生成签名的时间戳
             nonceStr: noncestr, // 必填,生成签名的随机串
             signature: signature, // 必填,签名,见附录1
+            url,
             jsApiList: [
                 "scanQRCode",
             ] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2

+ 7 - 7
src/pages/express.vue

@@ -120,10 +120,10 @@
 			</div>
 		</div>
 
-		<!-- 授权码 -->
+		<!-- 财务核销码 -->
 		<div class="az" v-if="SendInfoValue.isVerification == 1">
-			<van-field style="font-size: 16px;" v-model="authorization" name="authorization" label="授权码"
-				placeholder="请输入授权码" />
+			<van-field style="font-size: 16px;" v-model="authorization" name="authorization" label="财务核销码"
+				placeholder="请输入财务核销码" />
 			<img @click="vxSearchIcon" src="../assets/images/sm.png" alt="">
 		</div>
 
@@ -210,7 +210,7 @@ export default {
 			elvenPhone: '',//收件人输入的手机号
 			pattern: /^\d{11}$/,
 			SendInfoValue: {},//寄件人信息
-			authorization: '',//授权
+			authorization: '',//财务核销
 			getPrintersList: [],//打印机获取数据
 			printerShow: false,//打印机出现
 			printerName: '',//选中的打印机名称
@@ -287,7 +287,7 @@ export default {
 
 		},
 
-		// 授权码哦icon扫描
+		// 财务核销码哦icon扫描
 		async vxSearchIcon() {
 			console.log('123')
 			wx.scanQRCode({
@@ -404,7 +404,7 @@ export default {
 				return
 			}
 			if (this.authorization == '' & this.SendInfoValue.isVerification == 1) {
-				Toast('请填写授权码')
+				Toast('请填写财务核销码')
 				return
 			}
 			let payWay = ''
@@ -493,7 +493,7 @@ export default {
 				phone: this.SendInfoValue.phone,//寄件人手机号
 				addresseeName: this.transmitMessageVlaue.addresseeName,//寄件人姓名
 				addresseePhone: this.transmitMessageVlaue.addresseePhone,//收件人手机号
-				verificationCode: this.authorization, //授权
+				verificationCode: this.authorization, //财务核销
 				printId: e.id
 			}
 			const res = await saveMailDo({ ...parmas })

+ 1 - 1
src/pages/mailInfo.vue

@@ -34,7 +34,7 @@
 				<p>省:{{ ObjectVlaue.addresseeProvince }}</p>
 				<p>市:{{ ObjectVlaue.addresseeCity }}</p>
 				<p>区:{{ ObjectVlaue.addresseeCounty }}</p>
-				<p>授权码:{{ ObjectVlaue.verificationCode == '' ? '无' : ObjectVlaue.verificationCode }}</p>
+				<p>财务核销码:{{ ObjectVlaue.verificationCode == '' ? '无' : ObjectVlaue.verificationCode }}</p>
 				<p>备注:{{ ObjectVlaue.expressRemark }}</p>
 			</div>
 			<div class="info" v-if="mailDetail.type == '2'">