xin

pages/group/groupInfo.vue

@@ -444,7 +444,7 @@
 				})
 			},
 			// 点击佣金字段
-			clickBrokerage(){
+			clickBrokerage() {
 				this.settleShow = true
 				this.brokerageShow = true
 			},
@@ -760,6 +760,9 @@
 			// 打开拼团规则
 			openWord(url) {
 				// console.log(url)
+				uni.showLoading({
+					title: "文件打开中"
+				})
 				let newUrl = url.split('=')
 				let ruleUrl = newUrl[newUrl.length - 1].replace(/http:/g, 'https:')
 				// console.log(ruleUrl)
@@ -772,6 +775,7 @@
 									filePath: result.tempFilePath,
 									success: function() {
 										console.log('打开文档成功');
+										uni.hideLoading()
 									},
 								})
 							}
@@ -792,6 +796,7 @@
 							itemList: ['发送给朋友', '保存图片', '收藏'],
 							success: function(data) {
 								console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+								uni.hideLoading()
 							},
 							fail: function(err) {
 								console.log(err.errMsg);

pagesA/Contracts/LssueContracts/LssueContracts.vue

@@ -46,6 +46,14 @@
 					<image src="../../../static/images/right.png" mode=""></image>
 				</picker>
 			</view>
+			<view class="LssueContracts_item" v-if="!onTemplate&&typeValue=='固定价差'">
+				固定价差固化期限
+				<picker class="picker" mode="date" fields="year" :start="contractStartTime" :end="contractEndTime"
+					@change="bindDeadlineChange">
+					<view class="uni-input">{{deadline ? deadline : '请选择固化期限'}}</view>
+					<image src="../../../static/images/right.png" mode=""></image>
+				</picker>
+			</view>
 			<view class="LssueContracts_accessory" v-if="onTemplate">
 				<view class="LssueContracts_accessory_title">合同附件(请上传照片或者PDF文件)</view>
 				<view class="LssueContracts_accessory_imgs">
@@ -60,9 +68,10 @@
 		<view class="wenxintishi" v-if="!onTemplate">
 			<view class="wenxintishi_block">
 				如电客或电力用户对合同条款有任何个性化诉求的，请及时联系平台法务专员获取个性化定制合同条款。如电客或电力用户擅自修改合同条款的，有可能导致合同审核不通过、参与拼团失败等情况，
-				<view @click="callkf" class="lianxikefu">
-					<image src="https://fire.huoshitou.net/profile/icon/phone_icon.png"></image>联系合同专员！
-				</view>
+				<text @click="callkf" class="lianxikefu">
+					<!-- <image src="https://fire.huoshitou.net/profile/icon/phone_icon.png"></image> -->
+					联系合同专员！
+				</text>
 			</view>
 		</view>
 
@@ -121,6 +130,7 @@
 				shareRatio: '', //分成比例(%)  contractType为 2 必传
 				contractStartTime: '', //合同开始时间
 				contractEndTime: '', //合同结束时间
+				deadline: '', // 固定价差固化时间
 				electricId: '', //电客id
 				typeValue: '', //合同类型名称
 				typeOptions: ['固定价差', '月竞分成'], //合同类型
@@ -276,6 +286,17 @@
 					this.contractEndTime = e.detail.value + '/12/31'
 				}
 			},
+			//选择合同结束时间
+			bindDeadlineChange(e) {
+				if(this.contractStartTime&&this.contractEndTime) {
+					this.deadline = e.detail.value + '/12/31'
+				} else {
+					uni.showToast({
+						title: '请选择合同时间',
+						icon: 'none'
+					})
+				}
+			},
 			// 去认证
 			linktoCertification() {
 				uni.navigateTo({
@@ -522,11 +543,11 @@
 
 				// display: flex;
 				.lianxikefu {
-					display: flex;
-					align-items: center;
-					position: absolute;
-					left: 124rpx;
-					bottom: 0;
+					// display: flex;
+					// align-items: center;
+					// position: absolute;
+					// left: 124rpx;
+					// bottom: 0;
 					width: 200rpx;
 					height: auto;
 					border-bottom: 1px solid #1989fa;

unpackage/dist/build/mp-weixin/pagesA/Contracts/LssueContracts/LssueContracts.wxml

-<view class="LssueContracts"><view class="LssueContracts_box"><view class="LssueContracts_item">合同类型<picker class="picker" mode="selector" range="{{typeOptions}}" data-event-opts="{{[['change',[['bindTypeChange',['$event']]]]]}}" bindchange="__e"><view>{{typeValue?typeValue:'请选择合同类型'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同甲方<input type="text" placeholder="请输入公司名称" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','contractA','$event',[]]]]]]}}" value="{{contractA}}" bindinput="__e"/></view><view class="LssueContracts_item">合同乙方<picker class="picker" mode="selector" range="{{companyOptions}}" data-event-opts="{{[['change',[['bindCompanyChange',['$event']]]]]}}" bindchange="__e"><view>{{companyValue?companyValue:'请选择合同乙方'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同电量(万kWh)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','electricity','$event',[]]]]]]}}" value="{{electricity}}" bindinput="__e"/></view><block wx:if="{{typeValue=='月竞分成'}}"><view class="LssueContracts_item">分成比例(%)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','shareRatio','$event',[]]]]]]}}" value="{{shareRatio}}" bindinput="__e"/></view></block><block wx:if="{{typeValue=='固定价差'}}"><view class="LssueContracts_item">固定价差(厘/千瓦时)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','fixedSpread','$event',[]]]]]]}}" value="{{fixedSpread}}" bindinput="__e"/></view></block><view class="LssueContracts_item">合同开始时间<picker class="picker" mode="date" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindStartDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractStartTime?contractStartTime:'请选择开始时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同结束时间<picker class="picker" mode="date" fields="year" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindEndDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractEndTime?contractEndTime:'请选择结束时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><block wx:if="{{onTemplate}}"><view class="LssueContracts_accessory"><view class="LssueContracts_accessory_title">合同附件(请上传照片或者PDF文件)</view><view class="LssueContracts_accessory_imgs"><block wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><image src="{{item}}" data-event-opts="{{[['tap',[['slectImage',[index]]]]]}}" bindtap="__e"></image></block><block wx:if="{{pdFurl}}"><view data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" class="pdf_box" bindtap="__e">上传成功</view></block><block wx:if="{{onUpload}}"><image src="../../../static/images/upload_bg.png" data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" bindtap="__e"></image></block></view></view></block></view><block wx:if="{{!onTemplate}}"><view class="wenxintishi"><view class="wenxintishi_block">如电客或电力用户对合同条款有任何个性化诉求的，请及时联系平台法务专员获取个性化定制合同条款。如电客或电力用户擅自修改合同条款的，有可能导致合同审核不通过、参与拼团失败等情况，<view data-event-opts="{{[['tap',[['callkf',['$event']]]]]}}" class="lianxikefu" bindtap="__e"><image src="https://fire.huoshitou.net/profile/icon/phone_icon.png"></image>联系合同专员！</view></view></view></block><view class="{{['LssueContracts_btn',[(onSubmint)?'active_btn':''],[(!onTemplate)?'btn_marginTop':'']]}}"><block wx:if="{{onSubmint}}"><view>保存合同中</view></block><block wx:if="{{!onTemplate}}"><view data-event-opts="{{[['tap',[['openContract',['$event']]]]]}}" bindtap="__e">预览并下载</view></block><block wx:else><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">保存</view></block></view><block wx:if="{{dialogShow}}"><view class="LssueContracts_dialog"><view class="LssueContracts_dialog_box"><view class="dialog_hint">请先完成实名认证</view><view class="dialog_btn"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['linktoCertification',['$event']]]]]}}" class="btn_right" bindtap="__e">去认证</view></view></view></view></block></view>
+<view class="LssueContracts"><view class="LssueContracts_box"><view class="LssueContracts_item">合同类型<picker class="picker" mode="selector" range="{{typeOptions}}" data-event-opts="{{[['change',[['bindTypeChange',['$event']]]]]}}" bindchange="__e"><view>{{typeValue?typeValue:'请选择合同类型'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同甲方<input type="text" placeholder="请输入公司名称" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','contractA','$event',[]]]]]]}}" value="{{contractA}}" bindinput="__e"/></view><view class="LssueContracts_item">合同乙方<picker class="picker" mode="selector" range="{{companyOptions}}" data-event-opts="{{[['change',[['bindCompanyChange',['$event']]]]]}}" bindchange="__e"><view>{{companyValue?companyValue:'请选择合同乙方'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同电量(万kWh)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','electricity','$event',[]]]]]]}}" value="{{electricity}}" bindinput="__e"/></view><block wx:if="{{typeValue=='月竞分成'}}"><view class="LssueContracts_item">分成比例(%)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','shareRatio','$event',[]]]]]]}}" value="{{shareRatio}}" bindinput="__e"/></view></block><block wx:if="{{typeValue=='固定价差'}}"><view class="LssueContracts_item">固定价差(厘/千瓦时)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','fixedSpread','$event',[]]]]]]}}" value="{{fixedSpread}}" bindinput="__e"/></view></block><view class="LssueContracts_item">合同开始时间<picker class="picker" mode="date" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindStartDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractStartTime?contractStartTime:'请选择开始时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同结束时间<picker class="picker" mode="date" fields="year" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindEndDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractEndTime?contractEndTime:'请选择结束时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><block wx:if="{{!onTemplate&&typeValue=='固定价差'}}"><view class="LssueContracts_item">固定价差固化期限<picker class="picker" mode="date" fields="year" start="{{contractStartTime}}" end="{{contractEndTime}}" data-event-opts="{{[['change',[['bindDeadlineChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{deadline?deadline:'请选择固化期限'}}</view><image src="../../../static/images/right.png" mode></image></picker></view></block><block wx:if="{{onTemplate}}"><view class="LssueContracts_accessory"><view class="LssueContracts_accessory_title">合同附件(请上传照片或者PDF文件)</view><view class="LssueContracts_accessory_imgs"><block wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><image src="{{item}}" data-event-opts="{{[['tap',[['slectImage',[index]]]]]}}" bindtap="__e"></image></block><block wx:if="{{pdFurl}}"><view data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" class="pdf_box" bindtap="__e">上传成功</view></block><block wx:if="{{onUpload}}"><image src="../../../static/images/upload_bg.png" data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" bindtap="__e"></image></block></view></view></block></view><block wx:if="{{!onTemplate}}"><view class="wenxintishi"><view class="wenxintishi_block">如电客或电力用户对合同条款有任何个性化诉求的，请及时联系平台法务专员获取个性化定制合同条款。如电客或电力用户擅自修改合同条款的，有可能导致合同审核不通过、参与拼团失败等情况，<text data-event-opts="{{[['tap',[['callkf',['$event']]]]]}}" class="lianxikefu" bindtap="__e">联系合同专员！</text></view></view></block><view class="{{['LssueContracts_btn',[(onSubmint)?'active_btn':''],[(!onTemplate)?'btn_marginTop':'']]}}"><block wx:if="{{onSubmint}}"><view>保存合同中</view></block><block wx:if="{{!onTemplate}}"><view data-event-opts="{{[['tap',[['openContract',['$event']]]]]}}" bindtap="__e">预览并下载</view></block><block wx:else><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">保存</view></block></view><block wx:if="{{dialogShow}}"><view class="LssueContracts_dialog"><view class="LssueContracts_dialog_box"><view class="dialog_hint">请先完成实名认证</view><view class="dialog_btn"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['linktoCertification',['$event']]]]]}}" class="btn_right" bindtap="__e">去认证</view></view></view></view></block></view>
\ No newline at end of file

unpackage/dist/build/mp-weixin/pagesA/Contracts/LssueContracts/LssueContracts.wxss

-.LssueContracts{position:relative;width:100%;min-height:100%;overflow:hidden;background-color:#f4f5f7}.LssueContracts .wenxintishi{color:#333;font-size:24rpx;margin-top:20rpx;text-indent:32rpx}.LssueContracts .wenxintishi .wenxintishi_block{position:relative;padding:0 32rpx}.LssueContracts .wenxintishi .wenxintishi_block .lianxikefu{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;position:absolute;left:124rpx;bottom:0;width:200rpx;height:auto;border-bottom:1px solid #1989fa;color:#1989fa}.LssueContracts .wenxintishi .wenxintishi_block .lianxikefu image{margin-right:4rpx;width:26rpx;height:26rpx}.LssueContracts .LssueContracts_box{padding:0 32rpx;background-color:#fff}.LssueContracts .LssueContracts_box .LssueContracts_item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;width:100%;height:auto;font-size:34rpx;color:#333;border-bottom:1rpx solid #f4f5f7}.LssueContracts .LssueContracts_box .LssueContracts_item picker,
+.LssueContracts{position:relative;width:100%;min-height:100%;overflow:hidden;background-color:#f4f5f7}.LssueContracts .wenxintishi{color:#333;font-size:24rpx;margin-top:20rpx;text-indent:32rpx}.LssueContracts .wenxintishi .wenxintishi_block{position:relative;padding:0 32rpx}.LssueContracts .wenxintishi .wenxintishi_block .lianxikefu{width:200rpx;height:auto;border-bottom:1px solid #1989fa;color:#1989fa}.LssueContracts .wenxintishi .wenxintishi_block .lianxikefu image{margin-right:4rpx;width:26rpx;height:26rpx}.LssueContracts .LssueContracts_box{padding:0 32rpx;background-color:#fff}.LssueContracts .LssueContracts_box .LssueContracts_item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;width:100%;height:auto;font-size:34rpx;color:#333;border-bottom:1rpx solid #f4f5f7}.LssueContracts .LssueContracts_box .LssueContracts_item picker,
 .LssueContracts .LssueContracts_box .LssueContracts_item input,
 .LssueContracts .LssueContracts_box .LssueContracts_item text{-webkit-box-flex:1;-webkit-flex:1;flex:1;height:110rpx;line-height:110rpx;font-size:24rpx;font-weight:500;text-align:right;color:#999}.LssueContracts .LssueContracts_box .LssueContracts_item .picker{position:relative;padding-right:20rpx}.LssueContracts .LssueContracts_box .LssueContracts_item .picker view{display:inline-block}.LssueContracts .LssueContracts_box .LssueContracts_item .picker image{position:absolute;right:0;top:40rpx;width:16rpx;height:32rpx}.LssueContracts .LssueContracts_box .LssueContracts_accessory{padding-bottom:16rpx;width:100%;height:auto;font-size:34rpx;color:#333}.LssueContracts .LssueContracts_box .LssueContracts_accessory .LssueContracts_accessory_title{height:110rpx;line-height:110rpx}.LssueContracts .LssueContracts_box .LssueContracts_accessory .LssueContracts_accessory_imgs{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;width:100%;height:auto}.LssueContracts .LssueContracts_box .LssueContracts_accessory .LssueContracts_accessory_imgs .pdf_box{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin-bottom:10rpx;margin-right:10rpx;width:180rpx;height:180rpx;background-color:#ccc;border:1rpx solid #999}.LssueContracts .LssueContracts_box .LssueContracts_accessory .LssueContracts_accessory_imgs image{width:180rpx;height:180rpx;margin-bottom:10rpx;margin-right:10rpx}.LssueContracts .LssueContracts_btn{margin:60rpx 0;margin-left:32rpx;width:686rpx;height:104rpx;line-height:104rpx;text-align:center;font-size:30rpx;font-weight:700;color:#fff;background-color:#1989fa;-webkit-border-radius:16rpx;border-radius:16rpx}.LssueContracts .active_btn{background-color:#ccc}.LssueContracts .btn_marginTop{margin-top:180rpx}.LssueContracts .LssueContracts_dialog{position:absolute;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.16)}.LssueContracts .LssueContracts_dialog .LssueContracts_dialog_box{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:1;width:500rpx;height:300rpx;background-color:#fff;-webkit-border-radius:16rpx;border-radius:16rpx}.LssueContracts .LssueContracts_dialog .LssueContracts_dialog_box .dialog_hint{height:200rpx;text-align:center;line-height:200rpx;font-size:32rpx}.LssueContracts .LssueContracts_dialog .LssueContracts_dialog_box .dialog_btn{display:-webkit-box;display:-webkit-flex;display:flex;height:100rpx;line-height:100rpx;text-align:center;font-size:30rpx;color:#1989fa;border-top:2rpx solid #f4f5f7}.LssueContracts .LssueContracts_dialog .LssueContracts_dialog_box .dialog_btn view{-webkit-box-flex:1;-webkit-flex:1;flex:1}.LssueContracts .LssueContracts_dialog .LssueContracts_dialog_box .dialog_btn .btn_right{border-left:2rpx solid #f4f5f7}
\ No newline at end of file

unpackage/dist/build/mp-weixin/pagesA/PromotionCenter/PromotionCenter.wxml

-<view class="PromotionCenter"><view class="PromotionCenter_top"><view class="top_content"><text data-event-opts="{{[['tap',[['linkto',['$event']]]]]}}" class="rule" bindtap="__e">推广规则</text><view class="top_content_one"><view class="row"><view class="row_title">累计推广奖励金</view><view class="money">{{"￥"+CumulativeMoney}}</view><view data-event-opts="{{[['tap',[['linktoRewardDetail',['$event']]]]]}}" class="row_title" bindtap="__e">查看明细></view></view><view class="row"><view class="row_title">可提现余额</view><view class="money">{{"￥"+withdrawal}}</view><view data-event-opts="{{[['tap',[['linktowithdrawal',['$event']]]]]}}" class="row_title" bindtap="__e">去提现></view></view></view><view class="top_content_two"><view class="user_info_code">{{'邀请码: '+(inviteCode?inviteCode:'需实名认证')+''}}<text data-event-opts="{{[['tap',[['getInviteCode']]]]}}" class="item-btn" bindtap="__e">复制</text></view></view></view></view><view class="promotedata"><view class="promote_title"><text>我推广的电客</text><text>推广收益</text></view><block wx:for="{{passenger}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list"><text class="num">{{index+1}}</text><image src="{{item.headImgUrl}}" mode></image><text>{{item.wxName}}</text><text class="shouyi">{{"￥"+(item.money?item.money:'0.00')}}</text><view class="hexian"></view></view></block></view><view class="button_box"><button type="default" data-event-opts="{{[['tap',[['openmakemoney',['$event']]]]]}}" bindtap="__e">立即推广</button></view><block wx:if="{{isshare}}"><bottom-window vue-id="4250ae6e-1" type="{{4}}" data-event-opts="{{[['^closeModel',[['closeModel']]]]}}" bind:closeModel="__e" bind:__l="__l"></bottom-window></block></view>
+<<<<<<< HEAD
\ No newline at end of file
+<view class="PromotionCenter"><view class="PromotionCenter_top"><view class="top_content"><text data-event-opts="{{[['tap',[['linkto',['$event']]]]]}}" class="rule" bindtap="__e">推广规则</text><view class="top_content_one"><view class="row"><view class="row_title">累计推广奖励金</view><view class="money">{{"￥"+CumulativeMoney}}</view><view data-event-opts="{{[['tap',[['linktoRewardDetail',['$event']]]]]}}" class="row_title" bindtap="__e">查看明细></view></view><view class="row"><view class="row_title">可提现余额</view><view class="money">{{"￥"+withdrawal}}</view><view data-event-opts="{{[['tap',[['linktowithdrawal',['$event']]]]]}}" class="row_title" bindtap="__e">去提现></view></view></view><view class="top_content_two"><view class="user_info_code">{{'邀请码: '+(inviteCode?inviteCode:'需实名认证')+''}}<text data-event-opts="{{[['tap',[['getInviteCode']]]]}}" class="item-btn" bindtap="__e">复制</text></view></view></view></view><view class="promotedata"><view class="promote_title"><text>我推广的电客</text><text>推广收益</text></view><block wx:for="{{passenger}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list"><text class="num">{{index+1}}</text><image src="{{item.headImgUrl}}" mode></image><text>{{item.wxName}}</text><text class="shouyi">{{"￥"+(item.money?item.money:'0.00')}}</text><view class="hexian"></view></view></block></view><view class="button_box"><button type="default" data-event-opts="{{[['tap',[['openmakemoney',['$event']]]]]}}" bindtap="__e">立即推广</button></view><block wx:if="{{isshare}}"><bottom-window vue-id="4250ae6e-1" type="{{4}}" data-event-opts="{{[['^closeModel',[['closeModel']]]]}}" bind:closeModel="__e" bind:__l="__l"></bottom-window></block></view>
+=======
+<view class="PromotionCenter"><view class="PromotionCenter_top"><view class="top_content"><text data-event-opts="{{[['tap',[['linkto',['$event']]]]]}}" class="rule" bindtap="__e">推广规则</text><view class="top_content_one"><view class="row"><view class="row_title">累计推广奖励金</view><view class="money">{{"￥"+CumulativeMoney}}</view><view data-event-opts="{{[['tap',[['linktoRewardDetail',['$event']]]]]}}" class="row_title" bindtap="__e">查看明细></view></view><view class="row"><view class="row_title">可提现余额</view><view class="money">{{"￥"+withdrawal}}</view><view data-event-opts="{{[['tap',[['linktowithdrawal',['$event']]]]]}}" class="row_title" bindtap="__e">去提现></view></view></view><view class="top_content_two"><view class="user_info_code">{{'邀请码: '+(inviteCode?inviteCode:'需实名认证')+''}}<text data-event-opts="{{[['tap',[['getInviteCode']]]]}}" class="item-btn" bindtap="__e">复制</text></view></view></view></view><view class="promotedata"><view class="promote_title"><text>我推广的电客</text><text>推广收益</text></view><block wx:for="{{passenger}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list"><text class="num">{{index+1}}</text><image src="{{item.headImgUrl}}" mode></image><text>{{item.wxName}}</text><text class="shouyi">{{"￥"+(item.money?item.money:'0.00')}}</text><view class="hexian"></view></view></block></view><view class="button_box"><button type="default" data-event-opts="{{[['tap',[['openmakemoney',['$event']]]]]}}" bindtap="__e">立即推广</button></view><block wx:if="{{isshare}}"><bottom-window vue-id="4250ae6e-1" type="{{3}}" data-event-opts="{{[['^closeModel',[['closeModel']]]]}}" bind:closeModel="__e" bind:__l="__l"></bottom-window></block></view>
+>>>>>>> 26b2645239d9ad4e2c0cc672ef38a134cf4fb302

unpackage/dist/dev/mp-weixin/pages/group/groupInfo.js

@@ -975,6 +975,9 @@ var _api = _interopRequireDefault(__webpack_require__(/*! ../../static/util/api.
     // 打开拼团规则
     openWord: function openWord(url) {
       // console.log(url)
+      uni.showLoading({
+        title: "文件打开中" });
+
       var newUrl = url.split('=');
       var ruleUrl = newUrl[newUrl.length - 1].replace(/http:/g, 'https:');
       // console.log(ruleUrl)
@@ -987,6 +990,7 @@ var _api = _interopRequireDefault(__webpack_require__(/*! ../../static/util/api.
                 filePath: result.tempFilePath,
                 success: function success() {
                   console.log('打开文档成功');
+                  uni.hideLoading();
                 } });
 
             }
@@ -1007,6 +1011,7 @@ var _api = _interopRequireDefault(__webpack_require__(/*! ../../static/util/api.
             itemList: ['发送给朋友', '保存图片', '收藏'],
             success: function success(data) {
               console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+              uni.hideLoading();
             },
             fail: function fail(err) {
               console.log(err.errMsg);

unpackage/dist/dev/mp-weixin/pagesA/Contracts/LssueContracts/LssueContracts.js

@@ -201,6 +201,15 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -309,6 +318,15 @@ var _fun = __webpack_require__(/*! @/static/util/fun.js */ 50);function _interop
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = { created: function created() {this.electricId = uni.getStorageSync('user').electricId; // 售电公司列表
     this.getElectricitySalesCompaniesList();}, onLoad: function onLoad(options) {var that = this;that.contractId = options.id;if (options.template) {that.onTemplate = false;uni.setNavigationBarTitle({ title: '开具合同' });}}, onShow: function onShow() {this.getUserMessage();this.dialogShow = false;}, data: function data() {return { contractId: '', //合同id
       contractType: '', //合同类型 1-固定价差, 3-月竞分成
@@ -319,6 +337,7 @@ var _default = { created: function created() {this.electricId = uni.getStorageSy
       shareRatio: '', //分成比例(%)  contractType为 2 必传
       contractStartTime: '', //合同开始时间
       contractEndTime: '', //合同结束时间
+      deadline: '', // 固定价差固化时间
       electricId: '', //电客id
       typeValue: '', //合同类型名称
       typeOptions: ['固定价差', '月竞分成'], //合同类型
@@ -341,17 +360,8 @@ var _default = { created: function created() {this.electricId = uni.getStorageSy
     getElectricitySalesCompaniesList: function getElectricitySalesCompaniesList() {var that = this;(0, _fun.get)(_api.default.electricitySalesCompaniesList).then(function (res) {if (res.code == 200) {console.log('获取售电公司列表');that.companys = res.data;that.companyOptions = res.data.map(function (item) {return item.eName;}); // console.log(that.companys)
           if (that.contractId) {that.datashow();}}});}, //数据回显
     datashow: function datashow() {var that = this; // 编辑合同的数据回显
-      (0, _fun.get)(_api.default.contractDetail, { contractId: that.contractId }).then(function (res) {console.log('获取合同信息');
-        // console.log(res.data)
-        if (res.code == 200) {
-          that.contractA = res.data.contractA;
-          that.companyValue = res.data.ename;
-          var arr = that.companys.filter(function (item) {
-            return item.eName == that.companyValue;
-          });
-          that.userId = arr[0].userId;
-          that.electricity = res.data.electricity;
-          that.contractStartTime = res.data.contractStartTime.replace(new RegExp('-', 'g'), '/');
+      (0, _fun.get)(_api.default.contractDetail, { contractId: that.contractId }).then(function (res) {console.log('获取合同信息'); // console.log(res.data)
+        if (res.code == 200) {that.contractA = res.data.contractA;that.companyValue = res.data.ename;var arr = that.companys.filter(function (item) {return item.eName == that.companyValue;});that.userId = arr[0].userId;that.electricity = res.data.electricity;that.contractStartTime = res.data.contractStartTime.replace(new RegExp('-', 'g'), '/');
           that.contractEndTime = res.data.contractEndTime.replace(new RegExp('-', 'g'), '/');
           that.contractType = res.data.contractType;
           if (that.contractType == 1) {
@@ -413,6 +423,17 @@ var _default = { created: function created() {this.electricId = uni.getStorageSy
         this.contractEndTime = e.detail.value + '/12/31';
       }
     },
+    //选择合同结束时间
+    bindDeadlineChange: function bindDeadlineChange(e) {
+      if (this.contractStartTime && this.contractEndTime) {
+        this.deadline = e.detail.value + '/12/31';
+      } else {
+        uni.showToast({
+          title: '请选择合同时间',
+          icon: 'none' });
+
+      }
+    },
     // 去认证
     linktoCertification: function linktoCertification() {
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/pagesA/Contracts/LssueContracts/LssueContracts.wxml

-<view class="LssueContracts"><view class="LssueContracts_box"><view class="LssueContracts_item">合同类型<picker class="picker" mode="selector" range="{{typeOptions}}" data-event-opts="{{[['change',[['bindTypeChange',['$event']]]]]}}" bindchange="__e"><view>{{typeValue?typeValue:'请选择合同类型'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同甲方<input type="text" placeholder="请输入公司名称" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','contractA','$event',[]]]]]]}}" value="{{contractA}}" bindinput="__e"/></view><view class="LssueContracts_item">合同乙方<picker class="picker" mode="selector" range="{{companyOptions}}" data-event-opts="{{[['change',[['bindCompanyChange',['$event']]]]]}}" bindchange="__e"><view>{{companyValue?companyValue:'请选择合同乙方'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同电量(万kWh)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','electricity','$event',[]]]]]]}}" value="{{electricity}}" bindinput="__e"/></view><block wx:if="{{typeValue=='月竞分成'}}"><view class="LssueContracts_item">分成比例(%)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','shareRatio','$event',[]]]]]]}}" value="{{shareRatio}}" bindinput="__e"/></view></block><block wx:if="{{typeValue=='固定价差'}}"><view class="LssueContracts_item">固定价差(厘/千瓦时)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','fixedSpread','$event',[]]]]]]}}" value="{{fixedSpread}}" bindinput="__e"/></view></block><view class="LssueContracts_item">合同开始时间<picker class="picker" mode="date" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindStartDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractStartTime?contractStartTime:'请选择开始时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同结束时间<picker class="picker" mode="date" fields="year" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindEndDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractEndTime?contractEndTime:'请选择结束时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><block wx:if="{{onTemplate}}"><view class="LssueContracts_accessory"><view class="LssueContracts_accessory_title">合同附件(请上传照片或者PDF文件)</view><view class="LssueContracts_accessory_imgs"><block wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><image src="{{item}}" data-event-opts="{{[['tap',[['slectImage',[index]]]]]}}" bindtap="__e"></image></block><block wx:if="{{pdFurl}}"><view data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" class="pdf_box" bindtap="__e">上传成功</view></block><block wx:if="{{onUpload}}"><image src="../../../static/images/upload_bg.png" data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" bindtap="__e"></image></block></view></view></block></view><block wx:if="{{!onTemplate}}"><view class="wenxintishi"><view class="wenxintishi_block">如电客或电力用户对合同条款有任何个性化诉求的，请及时联系平台法务专员获取个性化定制合同条款。如电客或电力用户擅自修改合同条款的，有可能导致合同审核不通过、参与拼团失败等情况，<view data-event-opts="{{[['tap',[['callkf',['$event']]]]]}}" class="lianxikefu" bindtap="__e"><image src="https://fire.huoshitou.net/profile/icon/phone_icon.png"></image>联系合同专员！</view></view></view></block><view class="{{['LssueContracts_btn',[(onSubmint)?'active_btn':''],[(!onTemplate)?'btn_marginTop':'']]}}"><block wx:if="{{onSubmint}}"><view>保存合同中</view></block><block wx:if="{{!onTemplate}}"><view data-event-opts="{{[['tap',[['openContract',['$event']]]]]}}" bindtap="__e">预览并下载</view></block><block wx:else><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">保存</view></block></view><block wx:if="{{dialogShow}}"><view class="LssueContracts_dialog"><view class="LssueContracts_dialog_box"><view class="dialog_hint">请先完成实名认证</view><view class="dialog_btn"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['linktoCertification',['$event']]]]]}}" class="btn_right" bindtap="__e">去认证</view></view></view></view></block></view>
+<view class="LssueContracts"><view class="LssueContracts_box"><view class="LssueContracts_item">合同类型<picker class="picker" mode="selector" range="{{typeOptions}}" data-event-opts="{{[['change',[['bindTypeChange',['$event']]]]]}}" bindchange="__e"><view>{{typeValue?typeValue:'请选择合同类型'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同甲方<input type="text" placeholder="请输入公司名称" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','contractA','$event',[]]]]]]}}" value="{{contractA}}" bindinput="__e"/></view><view class="LssueContracts_item">合同乙方<picker class="picker" mode="selector" range="{{companyOptions}}" data-event-opts="{{[['change',[['bindCompanyChange',['$event']]]]]}}" bindchange="__e"><view>{{companyValue?companyValue:'请选择合同乙方'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同电量(万kWh)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','electricity','$event',[]]]]]]}}" value="{{electricity}}" bindinput="__e"/></view><block wx:if="{{typeValue=='月竞分成'}}"><view class="LssueContracts_item">分成比例(%)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','shareRatio','$event',[]]]]]]}}" value="{{shareRatio}}" bindinput="__e"/></view></block><block wx:if="{{typeValue=='固定价差'}}"><view class="LssueContracts_item">固定价差(厘/千瓦时)<input type="digit" placeholder="请输入" placeholder-style="color: #999" data-event-opts="{{[['input',[['__set_model',['','fixedSpread','$event',[]]]]]]}}" value="{{fixedSpread}}" bindinput="__e"/></view></block><view class="LssueContracts_item">合同开始时间<picker class="picker" mode="date" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindStartDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractStartTime?contractStartTime:'请选择开始时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><view class="LssueContracts_item">合同结束时间<picker class="picker" mode="date" fields="year" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindEndDateChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{contractEndTime?contractEndTime:'请选择结束时间'}}</view><image src="../../../static/images/right.png" mode></image></picker></view><block wx:if="{{!onTemplate&&typeValue=='固定价差'}}"><view class="LssueContracts_item">固定价差固化期限<picker class="picker" mode="date" fields="year" start="{{contractStartTime}}" end="{{contractEndTime}}" data-event-opts="{{[['change',[['bindDeadlineChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{deadline?deadline:'请选择固化期限'}}</view><image src="../../../static/images/right.png" mode></image></picker></view></block><block wx:if="{{onTemplate}}"><view class="LssueContracts_accessory"><view class="LssueContracts_accessory_title">合同附件(请上传照片或者PDF文件)</view><view class="LssueContracts_accessory_imgs"><block wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><image src="{{item}}" data-event-opts="{{[['tap',[['slectImage',[index]]]]]}}" bindtap="__e"></image></block><block wx:if="{{pdFurl}}"><view data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" class="pdf_box" bindtap="__e">上传成功</view></block><block wx:if="{{onUpload}}"><image src="../../../static/images/upload_bg.png" data-event-opts="{{[['tap',[['slectImage',['$0'],['imgList.length']]]]]}}" bindtap="__e"></image></block></view></view></block></view><block wx:if="{{!onTemplate}}"><view class="wenxintishi"><view class="wenxintishi_block">如电客或电力用户对合同条款有任何个性化诉求的，请及时联系平台法务专员获取个性化定制合同条款。如电客或电力用户擅自修改合同条款的，有可能导致合同审核不通过、参与拼团失败等情况，<text data-event-opts="{{[['tap',[['callkf',['$event']]]]]}}" class="lianxikefu" bindtap="__e">联系合同专员！</text></view></view></block><view class="{{['LssueContracts_btn',[(onSubmint)?'active_btn':''],[(!onTemplate)?'btn_marginTop':'']]}}"><block wx:if="{{onSubmint}}"><view>保存合同中</view></block><block wx:if="{{!onTemplate}}"><view data-event-opts="{{[['tap',[['openContract',['$event']]]]]}}" bindtap="__e">预览并下载</view></block><block wx:else><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">保存</view></block></view><block wx:if="{{dialogShow}}"><view class="LssueContracts_dialog"><view class="LssueContracts_dialog_box"><view class="dialog_hint">请先完成实名认证</view><view class="dialog_btn"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['linktoCertification',['$event']]]]]}}" class="btn_right" bindtap="__e">去认证</view></view></view></view></block></view>
\ No newline at end of file

unpackage/dist/dev/mp-weixin/pagesA/Contracts/LssueContracts/LssueContracts.wxss

@@ -42,15 +42,6 @@
   padding: 0 32rpx;
 }
 .LssueContracts .wenxintishi .wenxintishi_block .lianxikefu {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
-  position: absolute;
-  left: 124rpx;
-  bottom: 0;
   width: 200rpx;
   height: auto;
   border-bottom: 1px solid #1989fa;