Merge branch 'master' into develop

common/host.js

 // php测试环境
-export const php = 'http://test.pet-dbc.cn/mobile/index.php?'
+// 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?'
 
 // go测试环境
-export const go = 'https://tm.pet-dbc.cn'
+// 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

pages/checkstand/checkstand.vue

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

pages/signcontract/signcontract.vue

@@ -78,6 +78,11 @@
 									this.data = JSON.parse(contract_content);
 									this.is_eidt = true;
 								}
+							}else{
+								const temporary = uni.getStorageSync('temporary');
+								if (temporary) {
+									this.data = JSON.parse(temporary);
+								}
 							}
 							uni.request({
 								url: `/uni/api/signcontract/GetContractField?equipment_id=${equipment_id}`,
@@ -109,6 +114,8 @@
 					return;
 				}
 				const data = this.getData();
+				// 临时存储合同信息
+				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';
@@ -146,6 +153,8 @@
 			previewContract(){
 				const data = this.getData();
 				const install = uni.getStorageSync('installment');
+				// 临时存储合同信息
+				uni.setStorageSync('temporary', JSON.stringify(data));
 				const {contract_no, equipment_id, property_id} = install;
 				uni.showLoading({
 				  title: '获取合同中...',