bug修复

components/bottomWindow/bottomWindow.vue

@@ -124,9 +124,11 @@
 				
 			},
 			saveimg(url){
+				console.log(url)
+				let newUrl = url.replace('httpss:','https:')
 				let that=this
 				uni.downloadFile({
-					url:url, //仅为示例，并非真实的资源
+					url:newUrl, //仅为示例，并非真实的资源
 					success: (res) => {
 						if (res.statusCode === 200) {
 							uni.saveImageToPhotosAlbum({

manifest.json

@@ -73,7 +73,7 @@
                 "provider" : "wxaf8f505686ddf66a"
             }
         },
-        "appid" : "wx45bb68de16ddddb7",
+        "appid" : "wxb21370ac25ee51b0",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

pages.json

@@ -275,7 +275,7 @@
 		{
 			"path": "pages/myInfo/retailTrade",
 			"style": {
-				"navigationBarTitleText": "结算交易单",
+				"navigationBarTitleText": "结算联系单",
 				"enablePullDownRefresh": false
 			}
 		},

pages/declare/declare.vue

@@ -411,7 +411,7 @@
 						reportElectricity: this.form.num,
 					}).then(res => {
 						if (res.code == 200) {
-							let url = res.msg.replace('http', 'https')
+							let url = res.msg.replace('http:', 'https:')
 							const downloadTask = uni.downloadFile({
 								url: url, //仅为示例，并非真实的资源
 								filePath: wx.env.USER_DATA_PATH + '/月度委托电量确认函.docx',

pagesA/Contracts/EnterpriseContract/EnterpriseContract.vue

@@ -127,10 +127,14 @@
 					<view class="info_main">
 						<view class="info_main_content">
 							<text class="right_text">
-								<text class="right_title" v-if="item.status == 0">待盖章</text>
-								<text class="right_title" v-if="item.status == 1">已签收</text>
-								<text class="right_title" v-if="item.status == 3">已电子盖章</text>
-								<text class="right_title" v-if="item.status == 4">已生效</text>
+								<text class="right_title" v-if="item.status == 1">待确认</text>
+								<text class="right_title" v-if="item.status == 2">待盖章</text>
+								<text class="right_title" v-if="item.status == 9||item.status == 10">待签收</text>
+								<text class="right_title" v-if="item.status == 4||item.status == 5">已签收</text>
+								<text class="right_title" v-if="item.status == 6">待生效</text>
+								<text class="right_title" v-if="item.status == 7">已生效</text>
+								<text class="right_title" v-if="item.isContractASealed == 1||item.isContractASealed == 0">已电子盖章</text>
+								<text class="right_title" v-if="item.status == 8">已失效</text>
 							</text>
 							<view>合同编号: {{item.contractNumber}}</view>
 							<view>合同甲方: {{item.contractA}}</view>

pagesA/Contracts/LssueContracts/LssueContracts.vue

@@ -335,7 +335,7 @@
 						get(api.previewContract, params).then(res => {
 							console.log(res)
 							if (res.code == 200) {
-								let url = res.msg.replace(/http/g, 'https')
+								let url = res.msg.replace(/http:/g, 'https:')
 								uni.downloadFile({
 									url: url,
 									filePath: wx.env.USER_DATA_PATH + '/购售电交易合同.docx',

pagesA/Contracts/MyContractType/MyContractType.vue

@@ -74,9 +74,12 @@
 					<view v-else class="gray">合同确认中</view>
 				</view>
 				<view class="info_btns" v-else-if="status == 6">
-					<view v-if="item.isElectronicSeal == 0 || item.isElectronicSeal == 1"
+					<view v-if="(item.isElectronicSeal == 0||item.isElectronicSeal == 1)&&!onElectronicSeal"
 						@click="electronicSeal(item.id)">
 						电子盖章</view>
+					<view class="gray"
+						v-if="(item.isElectronicSeal == 0||item.isElectronicSeal == 1)&&onElectronicSeal">
+						电子盖章中</view>
 					<view v-if="item.isElectronicSeal == 0 || item.isElectronicSeal == 2"
 						@click="linktoExpressSingle(item.id)">上传快递单</view>
 					<view @click="downloadContract(item.id,item.contractType)">下载合同模板</view>
@@ -249,6 +252,7 @@
 				tableShow: false, // 分时价差表格
 				tableList: [], // 分时价差表格数据
 				// 电子盖章
+				onElectronicSeal: false, // 电子盖章中
 				contractDraftId: '', //草稿id
 				contractId: '', //合同id
 				page: '', //插件页面入口：doc(合同签署入口)，enterprise-auth(企业认证入口)，personal-auth(实名认证入口)，注意：如果当前签署用户进入合同签署入口，且需要认证，插件会自行跳转认证，认证成功后继续签署合同，即对接方若非需要单独进行用户认证，直接调用合同签署入口即可。
@@ -312,11 +316,15 @@
 			// 电子盖章
 			electronicSeal(id) {
 				this.contractId = id
+				this.onElectronicSeal = true
 				if (this.type == 1) {
 					this.getCompanyAcInformation()
 				} else {
 					this.getPersonalAuthenticationResult()
 				}
+				setTimeout(() => {
+					this.onElectronicSeal = false
+				}, 3000)
 			},
 			// 上传快递单
 			linktoExpressSingle(contractId) {
@@ -343,7 +351,7 @@
 				}).then(res => {
 					if (res.code == 200) {
 						let url = res.data
-						let path = url.replace('http', 'https')
+						let path = url.replace('http:', 'https:')
 						// console.log(path)
 						uni.downloadFile({
 							url: path,

pagesA/PowerOfAttorney/PowerOfAttorney.vue

@@ -279,7 +279,7 @@
 						name: 'file',
 						success: res => {
 							let url = JSON.parse(res.data).url
-							that.canvsaurls=url.replace('http','https')
+							that.canvsaurls=url.replace('http:','https:')
 							console.log(that.canvsaurls,'2222')
 							if(index==1){
 								that.previewImage()

unpackage/dist/build/mp-weixin/app.json

@@ -153,11 +153,7 @@
   },
   "permission": {
     "scope.userLocation": {
-<<<<<<< HEAD
-      "desc": "1111111"
-=======
       "desc": "获取用户头像昵称"
->>>>>>> cfd4269be7156bb981ee9cc6926c67c09a7814af
     }
   },
   "usingComponents": {

unpackage/dist/build/mp-weixin/components/bottomWindow/bottomWindow.js

-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/bottomWindow/bottomWindow"],{"2bba":function(e,t,o){"use strict";o.r(t);var n=o("cf5e"),a=o.n(n);for(var c in n)"default"!==c&&function(e){o.d(t,e,(function(){return n[e]}))}(c);t["default"]=a.a},"2be8":function(e,t,o){"use strict";var n;o.d(t,"b",(function(){return a})),o.d(t,"c",(function(){return c})),o.d(t,"a",(function(){return n}));var a=function(){var e=this,t=e.$createElement;e._self._c},c=[]},9537:function(e,t,o){"use strict";o.r(t);var n=o("2be8"),a=o("2bba");for(var c in a)"default"!==c&&function(e){o.d(t,e,(function(){return a[e]}))}(c);o("cff6");var s,i=o("f0c5"),l=Object(i["a"])(a["default"],n["b"],n["c"],!1,null,null,null,!1,n["a"],s);t["default"]=l.exports},cf5e:function(e,t,o){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n=o("a000"),a=c(o("7363"));function c(e){return e&&e.__esModule?e:{default:e}}var s={props:{type:{type:Number,default:0},packageId:{type:Number,default:0}},data:function(){return{dialogShow:!1,saveurl:""}},onLoad:function(){},methods:{onShareAppMessage:function(e){return{title:"张晓敏邀请您绑定成为他的用电企业会员",path:"/pages/login/login?id=张晓敏",imageUrl:"https://fire.huoshitou.net/profile/icon/yaoqing.png",content:"邀请您绑定成为他的用电企业会员",desc:"电客",success:function(e){console.log("111111"),console.log(e)},fail:function(e){console.log("222222"),console.log(e)}}},save:function(){var t=this,o=(e.getStorageSync("type"),e.getStorageSync("user").electricId);if(console.log("that.type",t.type),1==t.type){e.getStorageSync("user").inviteCode;(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"3&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))}else 2==t.type?(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/group/groupInfo",scene:t.packageId}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))):3==t.type&&(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"33&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})})))},saveimg:function(t){var o=this;e.downloadFile({url:t,success:function(t){200===t.statusCode&&e.saveImageToPhotosAlbum({filePath:t.tempFilePath,success:function(){o.dialogShow=!0,console.log()},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},cancleModel:function(){this.$emit("closeModel","closeModel")}}};t.default=s}).call(this,o("543d")["default"])},cff6:function(e,t,o){"use strict";var n=o("e2e4"),a=o.n(n);a.a},e2e4:function(e,t,o){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/bottomWindow/bottomWindow"],{"2bba":function(e,t,o){"use strict";o.r(t);var n=o("cf5e"),a=o.n(n);for(var c in n)"default"!==c&&function(e){o.d(t,e,(function(){return n[e]}))}(c);t["default"]=a.a},"47a0":function(e,t,o){"use strict";var n;o.d(t,"b",(function(){return a})),o.d(t,"c",(function(){return c})),o.d(t,"a",(function(){return n}));var a=function(){var e=this,t=e.$createElement;e._self._c},c=[]},9537:function(e,t,o){"use strict";o.r(t);var n=o("47a0"),a=o("2bba");for(var c in a)"default"!==c&&function(e){o.d(t,e,(function(){return a[e]}))}(c);o("cff6");var s,l=o("f0c5"),i=Object(l["a"])(a["default"],n["b"],n["c"],!1,null,null,null,!1,n["a"],s);t["default"]=i.exports},cf5e:function(e,t,o){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n=o("a000"),a=c(o("7363"));function c(e){return e&&e.__esModule?e:{default:e}}var s={props:{type:{type:Number,default:0},packageId:{type:Number,default:0}},data:function(){return{dialogShow:!1,saveurl:""}},onLoad:function(){},methods:{onShareAppMessage:function(e){return{title:"张晓敏邀请您绑定成为他的用电企业会员",path:"/pages/login/login?id=张晓敏",imageUrl:"https://fire.huoshitou.net/profile/icon/yaoqing.png",content:"邀请您绑定成为他的用电企业会员",desc:"电客",success:function(e){console.log("111111"),console.log(e)},fail:function(e){console.log("222222"),console.log(e)}}},save:function(){var t=this,o=(e.getStorageSync("type"),e.getStorageSync("user").electricId);if(console.log("that.type",t.type),1==t.type){e.getStorageSync("user").inviteCode;(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"3&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))}else 2==t.type?(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/group/groupInfo",scene:t.packageId}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))):3==t.type&&(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"33&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})})))},saveimg:function(t){console.log(t);var o=t.replace("httpss:","https:"),n=this;e.downloadFile({url:o,success:function(t){200===t.statusCode&&e.saveImageToPhotosAlbum({filePath:t.tempFilePath,success:function(){n.dialogShow=!0,console.log()},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},cancleModel:function(){this.$emit("closeModel","closeModel")}}};t.default=s}).call(this,o("543d")["default"])},cff6:function(e,t,o){"use strict";var n=o("e2e4"),a=o.n(n);a.a},e2e4:function(e,t,o){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/bottomWindow/bottomWindow-create-component',
     {

unpackage/dist/build/mp-weixin/project.config.json

@@ -6,38 +6,8 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
-    "enhance": false,
     "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minified": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -45,15 +15,19 @@
   "projectname": "gangshi",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }