bug修复

manifest.json

@@ -75,7 +75,7 @@
         },
         "appid" : "wxb21370ac25ee51b0",
         "setting" : {
-            "urlCheck" : false,
+            "urlCheck" : true,
             "es6" : true,
             "postcss" : true,
             "minified" : true

pages/index/Calculator.vue

@@ -29,9 +29,9 @@
 			<text>企业通过调整峰平谷用电的比例，会影响售电公司进入现货批发部分电量的峰平谷分布，因现货峰平谷价格存在差异，导致最终企业度电综合批发成本不同。</text>
 			<text>二、现货计算器条件说明</text>
 			<text>1、0:00-7:00共8小时为谷期；9:00-11:00、14:00-16:00共6小时视为峰期；8:00、12:00-13:00、17:00-23:00共10个小时视为平期。</text>
-			<text>2、年度双边协商占比<text class="red">{{longRadio}}%;</text>月竟占比<text
+			<text>2、年度双边协商占比<text class="red">{{longRadio}}%;</text>月度集中竞争占比<text
 					class="red">{{monthRadio}}%;</text>现货占比<text class="red">{{cashRadio}}%</text></text>
-			<text>3、年度双边协商价格为市场均价<text class="red">{{bazaarAverage}}</text>厘/千瓦时；月竞价格为<text
+			<text>3、年度双边协商价格为市场均价<text class="red">{{bazaarAverage}}</text>厘/千瓦时；月度集中竞争价格为<text
 					class="red">{{monthAverage}}</text>厘/千瓦时；现货价格为试结算现货价格31天算数平均数。</text>
 			<text>4、企业度电批发成本未包括售电公司分摊费用及容量补偿费用。</text>
 		</view>

pages/index/index.vue

@@ -27,7 +27,7 @@
 		<!-- 轮播图 -->
 		<view class="banner">
 			<image src="https://fire.huoshitou.net/profile/icon/indexbanner.png" mode="widthFix"></image>
-			
+
 			<!-- <swiper :indicator-dots="true" :autoplay="true" :circular="true" :interval="3000" :duration="1000">
 				<swiper-item>
 					<image src="https://fire.huoshitou.net/profile/icon/banner1.png" mode="scaleToFill"></image>
@@ -90,7 +90,8 @@
 							<view style="height: 38rpx;" v-if="item.type == 3"></view>
 							<text style="margin-bottom: 0;">{{item.year}}年
 								<text v-if="remainder[index] == 0" class="count">已结束</text>
-								<text v-else class="count">结束倒计时:{{remainder[index] ? remainder[index] : '00:00:00'}}</text>
+								<text v-else
+									class="count">结束倒计时:{{remainder[index] ? remainder[index] : '00:00:00'}}</text>
 							</text>
 						</view>
 					</view>
@@ -155,7 +156,8 @@
 		<view class="regional" @click="toareaServe">
 			<view class="regional_title">
 				<view>区域服务中心</view>
-				<view class="more">查看详情 <image src="https://fire.huoshitou.net/profile/icon/index_jt.png" mode="scaleToFill"></image>
+				<view class="more">查看详情 <image src="https://fire.huoshitou.net/profile/icon/index_jt.png"
+						mode="scaleToFill"></image>
 				</view>
 			</view>
 			<view class="regional_main">
@@ -165,8 +167,11 @@
 		<!-- 售电资讯 -->
 		<view class="information">
 			<view class="information_title" @click="linktoInformation">
-				<text>行业资讯<!-- <text class="hyzx_xiao">关注实时 资讯不漏</text> --></text>
-				<view class="more">查看更多 <image src="https://fire.huoshitou.net/profile/icon/index_jt.png" mode="scaleToFill"></image>
+				<text>行业资讯
+					<!-- <text class="hyzx_xiao">关注实时 资讯不漏</text> -->
+				</text>
+				<view class="more">查看更多 <image src="https://fire.huoshitou.net/profile/icon/index_jt.png"
+						mode="scaleToFill"></image>
 				</view>
 			</view>
 			<view class="information_item" v-for="(item,index) in salesInformationList" :key="index"
@@ -265,10 +270,10 @@
 						enterpriseName: '欢迎中国能源建设集团广东火电工程有限公司',
 						packageName: '加入伙石头拼团'
 					},
-					// {
-					// 	enterpriseName: '欢迎广东华厦电力销售有限公司',
-					// 	packageName: '加入伙石头拼团'
-					// },
+					{
+						enterpriseName: '欢迎广东华厦电力销售有限公司',
+						packageName: '加入伙石头拼团'
+					},
 				], //所有企业
 				electricCount: 0, //电客数量
 				enterpriseCount: 0, //用电企业数量
@@ -340,7 +345,7 @@
 								(function(str) {
 									item.enterpriseName = str.substring(0, 2) + '***有限公司参与了'
 								}(item.enterpriseName))
-								item.packageName = '"' + item.packageName+'"拼团'
+								item.packageName = '"' + item.packageName + '"拼团'
 								return item
 							})
 						}
@@ -621,9 +626,9 @@
 		}
 
 		// 盈利详情
-		.yingli_title{
+		.yingli_title {
 			width: 100%;
-			text-indent:32rpx;
+			text-indent: 32rpx;
 			font-size: 33rpx;
 			font-weight: bold;
 			color: #333;
@@ -631,6 +636,7 @@
 			background-color: #fff;
 			margin-top: 20rpx;
 		}
+
 		.profit {
 			padding: 23rpx 32rpx;
 			margin-bottom: 24rpx;
@@ -656,29 +662,34 @@
 					font-size: 35rpx;
 					font-weight: 500;
 				}
-				.danwei{
+
+				.danwei {
 					margin-top: 0;
 					font-size: 12rpx;
 					font-weight: bold;
 				}
-				.jiaoyi{
+
+				.jiaoyi {
 					font-size: 28rpx;
 					margin-top: 0;
 					font-weight: bold;
 				}
 			}
-			.profit_item1{
-				background:url(https://fire.huoshitou.net/profile/icon/sy_icbg1.png) no-repeat;
+
+			.profit_item1 {
+				background: url(https://fire.huoshitou.net/profile/icon/sy_icbg1.png) no-repeat;
 				background-size: cover;
 				background-position: center;
 			}
-			.profit_item2{
-				background:url(https://fire.huoshitou.net/profile/icon/sy_icbg2.png) no-repeat;
+
+			.profit_item2 {
+				background: url(https://fire.huoshitou.net/profile/icon/sy_icbg2.png) no-repeat;
 				background-size: cover;
 				background-position: center;
 			}
-			.profit_item3{
-				background:url(https://fire.huoshitou.net/profile/icon/sy_icbg3.png) no-repeat;
+
+			.profit_item3 {
+				background: url(https://fire.huoshitou.net/profile/icon/sy_icbg3.png) no-repeat;
 				background-size: cover;
 				background-position: center;
 			}
@@ -727,13 +738,13 @@
 				font-size: 33rpx;
 				font-weight: bold;
 				color: #333;
-				
+
 				view {
 					position: relative;
 					width: 118rpx;
 					font-size: 24rpx;
 					color: #999;
-				
+
 					image {
 						position: absolute;
 						top: 6rpx;
@@ -968,8 +979,8 @@
 				font-size: 33rpx;
 				font-weight: bold;
 				color: #333;
-				
-				.hyzx_xiao{
+
+				.hyzx_xiao {
 					margin-left: 20rpx;
 					font-size: 20rpx;
 					font-weight: 400;
@@ -1009,7 +1020,8 @@
 					color: #999;
 					text-align: right;
 				}
-				.information_item_xian{
+
+				.information_item_xian {
 					width: 100%;
 					background-color: #000;
 					opacity: .3;

pagesA/Contracts/LssueContracts/LssueContracts.vue

@@ -62,7 +62,7 @@
 				如您有个性化合同模板需求，请
 				<view @click="callkf" class="lianxikefu">
 					<image src="https://fire.huoshitou.net/profile/icon/phone_icon.png" mode="widthFix"></image>
-					联系客服！
+					请联系合同专员！
 				</view>
 			</view>
 		</view>
@@ -514,6 +514,7 @@
 				display: flex;
 			}
 			.lianxikefu{
+				width: 228rpx;
 				border-bottom: 1px solid #1989fa;
 				color:#1989fa;
 				display: flex;

pagesA/PromotionCenter/PromotionCenter.vue

@@ -39,7 +39,7 @@
 				<text class="num">{{index+1}}</text>
 				<image :src="item.headImgUrl" mode=""></image>
 				<text>{{item.wxName}}</text>
-				<text class="shouyi">￥{{item.money}}</text>
+				<text class="shouyi">￥{{item.money?item.money:'0.00'}}</text>
 				<view class="hexian"></view>
 			</view>
 		</view>

pagesA/PromotionCenter/PromotionRules.vue

@@ -34,7 +34,7 @@
 					let inviteCode=uni.getStorageSync('user').inviteCode
 					let name=uni.getStorageSync('user').certificationName
 					return {
-						title:name+'邀请您绑定成为他的用电企业',
+						title:name+'邀请您绑定成为他的电客',
 						path: '/pages/login/login?inviteType=33&&inviteCode='+inviteCode,//分享的页面路径
 						imageUrl:'https://fire.huoshitou.net/profile/icon/yaoqing.png',
 						// content: '邀请您绑定成为他的用电企业会员',

pagesA/enquiry/Demand.vue

@@ -19,7 +19,7 @@
 					placeholder-class="placeholder" placeholder="请输入" />
 			</view>
 			<view class="between_price row_common" v-if="type == 2">
-				居间差价 (厘/千瓦时) <input style="color: #999;" type="number" v-model="JuDifference" value=""
+				电客收益差价 (厘/千瓦时) <input style="color: #999;" type="number" v-model="JuDifference" value=""
 					placeholder-class="placeholder" placeholder="请输入" />
 			</view>
 			<picker class="list" @change="bindyear" :range="yearlist">

pagesA/enquiry/Particulars.vue

@@ -14,7 +14,7 @@
 				<view v-if="messages.shareRatio&&messages.platformShareRatio==null">意向分成比例(%): {{messages.shareRatio}}
 				</view>
 				<view v-if="messages.platformShareRatio">意向分成比例(%): {{messages.platformShareRatio}}</view>
-				<view v-if="type==2">居间价差(厘/千瓦时):
+				<view v-if="type==2">电客收益价差(厘/千瓦时):
 					{{messages.platformIntermediateSpread?messages.platformIntermediateSpread: messages.intermediateSpread}}
 				</view>
 				<view v-if="messages.commissionRatio">佣金比例%:{{messages.commissionRatio}}</view>

static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
  // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录

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

@@ -4,10 +4,40 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "es6": true,
+    "enhance": false,
     "postcss": true,
-    "minified": 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
   },
   "compileType": "miniprogram",
   "libVersion": "",

unpackage/dist/build/mp-weixin/static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
  // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录