Merge branch 'develop' of http://39.96.27.29/zhengxiuming/shop_mobile_uni into develop

.gitignore

@@ -5,4 +5,4 @@
 
 /unpackage
 .DS_Store
-publish.sh
\ No newline at end of file
+prod.sh
\ No newline at end of file

common/host.js

@@ -2,16 +2,16 @@
 // export const php = 'http://test.pet-dbc.cn/mobile/index.php?'
 
 // php镜像
-export const php = 'https://jingxiang.pet-dbc.cn/mobile/index.php?'
+// export const php = 'https://jingxiang.pet-dbc.cn/mobile/index.php?'
 
 // php正式环境
-// export const php = 'https://shop.pet-dbc.cn/mobile/index.php?'
+export const php = 'https://shop.pet-dbc.cn/mobile/index.php?'
 
 // go测试环境
 // export const go = 'https://tm.pet-dbc.cn'
 
 // go镜像环境 
-export const go = 'https://jxm.pet-dbc.cn'
+// export const go = 'https://jxm.pet-dbc.cn'
 
 // go正式环境
-// export const go = 'https://m.pet-dbc.cn';
\ No newline at end of file
+export const go = 'https://m.pet-dbc.cn';
\ No newline at end of file

manifest.json

@@ -2,7 +2,7 @@
   "name": "shop_mobile_uni",
   "appid": "__UNI__F904656",
   "description": "",
-  "versionName": "1.0.9",
+  "versionName": "1.0.8",
   "versionCode": "100",
   "transformPx": false,
   "app-plus": {
@@ -51,7 +51,7 @@
       "mode": "history",
       "base": "/uni"
     },
-    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.9/",
+    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.8/",
     "optimization": {
       "treeShaking": {
         "enable": true

package-lock.json

 {
   "name": "shop_mobile_uni",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -28,5 +28,4 @@
     "jweixin-module": "^1.6.0",
     "moment": "^2.24.0"
   }
-	
 }

pages/checkstand/checkstand.vue

@@ -116,7 +116,7 @@
 				const {origin} = location;
 				const install = uni.getStorageSync('installment');
 				// 清除存储合同信息
-				uni.removeStorageSync('temporary');
+				// uni.removeStorageSync('temporary');
 				const {contract_no, equipment_id, property_id} = install;
 				if(!this.order_price || !contract_no){
 					uni.showToast({

pages/signcontract/signcontract.vue

@@ -79,10 +79,10 @@
 									this.is_eidt = true;
 								}
 							}else{
-								const temporary = uni.getStorageSync('temporary');
-								if (temporary) {
-									this.data = JSON.parse(temporary);
-								}
+								// const temporary = uni.getStorageSync('temporary');
+								// if (temporary) {
+								// 	this.data = JSON.parse(temporary);
+								// }
 							}
 							uni.request({
 								url: `/uni/api/signcontract/GetContractField?equipment_id=${equipment_id}`,
@@ -115,7 +115,7 @@
 				}
 				const data = this.getData();
 				// 临时存储合同信息
-				uni.setStorageSync('temporary', JSON.stringify(data));
+				// uni.setStorageSync('temporary', JSON.stringify(data));
 				const install = uni.getStorageSync('installment');
 				const {contract_no, equipment_id, property_id} = install;
 				const url = this.is_eidt ? '/uni/api/signcontract/EditContract' : '/uni/api/signcontract/AddContract';
@@ -154,7 +154,7 @@
 				const data = this.getData();
 				const install = uni.getStorageSync('installment');
 				// 临时存储合同信息
-				uni.setStorageSync('temporary', JSON.stringify(data));
+				// uni.setStorageSync('temporary', JSON.stringify(data));
 				const {contract_no, equipment_id, property_id} = install;
 				uni.showLoading({
 				  title: '获取合同中...',
@@ -173,7 +173,11 @@
 						const {data} = res;
 						uni.hideLoading();
 						if(data.code == 0){
-							this.$jump(data.data.viewUrl);
+							const url = data.data.viewUrl;
+							// this.$jump(data.data.viewUrl);
+							uni.navigateTo({
+							  url: `/pages/web/web?contract_url=${url}`
+							});
 						}else{
 							uni.showToast({
 								icon: 'none',
@@ -208,6 +212,7 @@
 	.sign_content {
 		background: #fff;
 		padding:  80rpx 36rpx 0;
+		padding-bottom: 100rpx;
 		.apply_title {
 			font-size:32rpx;
 			font-family:PingFangSC-Medium,PingFang SC;

pages/web/Web.vue

-<template>
-	<view>
-		<web-view :src="url"></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				url: ''
-			}
-		},
-		mounted() {
-			 this.url = this.$store.state.webviewUrl;
-		}
-	}
-</script>
-
-<style>
-</style>

pages/web/web.vue

 <template>
 	<view>
+		<TopBar title="分期合同"/>
 		<web-view :src="url"></web-view>
 	</view>
 </template>
 
 <script>
+	import {parse} from 'querystring';
+	import TopBar from '@/components/TopBar/TopBar.vue';
 	export default {
 		data() {
 			return {
@@ -12,7 +15,13 @@
 			}
 		},
 		mounted() {
-			 this.url = this.$store.state.webviewUrl;
+			const obj = window.location.href.split('?')[1];
+			const {contract_url} = parse(obj);
+			if(contract_url){
+				this.url = contract_url;
+			}else{
+				this.url = this.$store.state.webviewUrl;
+			}
 		}
 	}
 </script>