Commit 2aaddc54 authored by 郑秀明's avatar 郑秀明

bugfix

parent 9a188fe4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "shop_mobile_uni", "name": "shop_mobile_uni",
"appid": "__UNI__F904656", "appid": "__UNI__F904656",
"description": "", "description": "",
"versionName": "1.0.9", "versionName": "1.0.11",
"versionCode": "100", "versionCode": "100",
"transformPx": false, "transformPx": false,
"app-plus": { "app-plus": {
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
"mode": "history", "mode": "history",
"base": "/uni" "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/mirror/1.0.11/",
"optimization": { "optimization": {
"treeShaking": { "treeShaking": {
"enable": true "enable": true
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
const {origin} = location; const {origin} = location;
const install = uni.getStorageSync('installment'); const install = uni.getStorageSync('installment');
// 清除存储合同信息 // 清除存储合同信息
uni.removeStorageSync('temporary'); // uni.removeStorageSync('temporary');
const {contract_no, equipment_id, property_id} = install; const {contract_no, equipment_id, property_id} = install;
if(!this.order_price || !contract_no){ if(!this.order_price || !contract_no){
uni.showToast({ uni.showToast({
......
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
this.is_eidt = true; this.is_eidt = true;
} }
}else{ }else{
const temporary = uni.getStorageSync('temporary'); // const temporary = uni.getStorageSync('temporary');
if (temporary) { // if (temporary) {
this.data = JSON.parse(temporary); // this.data = JSON.parse(temporary);
} // }
} }
uni.request({ uni.request({
url: `/uni/api/signcontract/GetContractField?equipment_id=${equipment_id}`, url: `/uni/api/signcontract/GetContractField?equipment_id=${equipment_id}`,
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
} }
const data = this.getData(); const data = this.getData();
// 临时存储合同信息 // 临时存储合同信息
uni.setStorageSync('temporary', JSON.stringify(data)); // uni.setStorageSync('temporary', JSON.stringify(data));
const install = uni.getStorageSync('installment'); const install = uni.getStorageSync('installment');
const {contract_no, equipment_id, property_id} = install; const {contract_no, equipment_id, property_id} = install;
const url = this.is_eidt ? '/uni/api/signcontract/EditContract' : '/uni/api/signcontract/AddContract'; const url = this.is_eidt ? '/uni/api/signcontract/EditContract' : '/uni/api/signcontract/AddContract';
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
const data = this.getData(); const data = this.getData();
const install = uni.getStorageSync('installment'); 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; const {contract_no, equipment_id, property_id} = install;
uni.showLoading({ uni.showLoading({
title: '获取合同中...', title: '获取合同中...',
...@@ -173,7 +173,11 @@ ...@@ -173,7 +173,11 @@
const {data} = res; const {data} = res;
uni.hideLoading(); uni.hideLoading();
if(data.code == 0){ 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{ }else{
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
...@@ -208,6 +212,7 @@ ...@@ -208,6 +212,7 @@
.sign_content { .sign_content {
background: #fff; background: #fff;
padding: 80rpx 36rpx 0; padding: 80rpx 36rpx 0;
padding-bottom: 100rpx;
.apply_title { .apply_title {
font-size:32rpx; font-size:32rpx;
font-family:PingFangSC-Medium,PingFang SC; font-family:PingFangSC-Medium,PingFang SC;
......
<template> <template>
<view> <view>
<TopBar title="分期合同"/>
<web-view :src="url"></web-view> <web-view :src="url"></web-view>
</view> </view>
</template> </template>
<script> <script>
import {parse} from 'querystring';
import TopBar from '@/components/TopBar/TopBar.vue';
export default { export default {
data() { data() {
return { return {
...@@ -12,9 +15,15 @@ ...@@ -12,9 +15,15 @@
} }
}, },
mounted() { mounted() {
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; this.url = this.$store.state.webviewUrl;
} }
} }
}
</script> </script>
<style> <style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment