Skip to content

G
GangShi-un2
提交 c3d0eb9b authored 作者: 黄旭新's avatar 黄旭新
浏览文件
操作

xin

上级 827930b1 2c347da0
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 221 行增加 和 207 行删除
manifest.json
浏览文件 @ c3d0eb9b
......@@ -73,7 +73,7 @@
"provider" : "wxaf8f505686ddf66a"
}
},
"appid" : "wx45bb68de16ddddb7",
"appid" : "wxb21370ac25ee51b0",
"setting" : {
"urlCheck" : false,
"es6" : true,
......
pages/group/GroupCompany.vue
浏览文件 @ c3d0eb9b
......@@ -469,7 +469,7 @@
} else if (text.indexOf('W') > -1) {
this.hintText = '该企业是存量已交易远期企业，不能参与拼团'
this.btnText = '我知道了'
} else if (text.indexOf('b') > -1) {
} else if (text.indexOf('z') > -1) {
this.hintText = '该企业已参与独立询价套餐，不能参与拼团'
this.btnText = '我知道了'
} else if (text.indexOf('X') > -1) {
......
pages/group/groupInfo.vue
浏览文件 @ c3d0eb9b
......@@ -759,14 +759,14 @@
},
// 打开拼团规则
openWord(url) {
// console.log(url)
let newUrl = url.split('=')
let ruleUrl = newUrl[newUrl.length - 1].replace(/http:/g, 'https:')
console.log(ruleUrl)
// console.log(ruleUrl)
if (ruleUrl.lastIndexOf('.pdf') > -1 || ruleUrl.lastIndexOf('.doc') > -1) {
uni.downloadFile({
url: ruleUrl,
success: (result) => {
console.log(result)
if (result.statusCode == 200) {
uni.openDocument({
filePath: result.tempFilePath,
......
pagesA/Contracts/EnterpriseContract/EnterpriseContract.vue
浏览文件 @ c3d0eb9b
......@@ -133,7 +133,8 @@
<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 == 4||item.status == 5)&&(item.isContractASealed == 1||item.isContractASealed == 0)">已电子盖章</text>
<text class="right_title" v-if="item.status == 8">已失效</text>
</text>
<view>合同编号: {{item.contractNumber}}</view>
......@@ -265,10 +266,10 @@
});
// 获取地址
this.getAddress()
// 获取合同列表
this.getElectricContractList()
// 获取认证信息
this.getUserMessage()
// // 获取合同列表
// this.getElectricContractList()
// // 获取认证信息
// this.getUserMessage()
},
onLoad(options) {
if (options.tabIndex) {
......@@ -288,7 +289,7 @@
electricId: '', //电客id
enterpriseName: '', //搜索值
ContractType: 1, //合同类型，1线下合同，2平台合同，3存量合同
tabIndex: 1, //线下合同tab栏索引(线下合同状态): 1-未生效，2-审核通过，3-已生效
tabIndex: '', //线下合同tab栏索引(线下合同状态): 1-未生效，2-审核通过，3-已生效
address: '', //地址
contractdata: [], //合同列表
// 下拉
......
pagesA/Contracts/contract/contract.vue
浏览文件 @ c3d0eb9b
......@@ -18,9 +18,9 @@
<!-- 选择合同start -->
<view class="contract_main">
<radio-group name="" class="radio_group" @change="getContract">
<label v-for="item in contractdata" :key='index'>
<label v-for="(item,index) in contractdata" :key="index">
<view class="contract_item">
<radio :value="item.id" color="#1989fa" :checked="contractId==item.id?true:false"/>
<radio :value="item.id" color="#1989fa" :checked="contractId==item.id?true:false" />
<view class="contract_item_info">
<view>合同编号：{{item.contractNumber}}</view>
<view>合同甲方：{{item.contractA}}</view>
......@@ -32,7 +32,8 @@
<view v-if="item.contractType==3">分成比例：{{item.shareRatio}}</view>
<view>合同期限：{{item.contractStartTime}} - {{item.contractEndTime}}</view>
<view>合同附件：
<text v-if="item.contractAnnex!=null" style="color: #1989fa;" @click.stop="checkFile">点击查看</text>
<text v-if="item.contractAnnex!=null" style="color: #1989fa;"
@click.stop="checkFile(item.contractAnnex,item.id)">点击查看</text>
<text v-else>无</text>
</view>
</view>
......@@ -64,37 +65,37 @@
return {
dialogShow: false, //弹窗
contract: '', //合同
contractdata:[],//合同列表
electricId:'',//电客id
contractId:'',//合同id
inquiryId:'',//询价单id
year:'',//年份
contractdata: [], //合同列表
electricId: '', //电客id
contractId: '', //合同id
inquiryId: '', //询价单id
year: '', //年份
}
},
onLoad(options) {
if(options){
if (options) {
console.log(options)
this.inquiryId=options.inquiryId
this.year=options.year
this.inquiryId = options.inquiryId
this.year = options.year
}
let that=this
let that = this
this.electricId = uni.getStorageSync('user').electricId
get(api.inquiryChooseContractList,{
userId:this.electricId,
year:this.year,
}).then(res=>{
if(res.code==200){
that.contractdata=res.data
}else{
get(api.inquiryChooseContractList, {
userId: this.electricId,
year: this.year,
}).then(res => {
if (res.code == 200) {
that.contractdata = res.data
} else {
uni.showToast({
title:res.msg,
icon:'none'
title: res.msg,
icon: 'none'
})
}
})
},
created() {
},
methods: {
// 选择合同
......@@ -105,44 +106,46 @@
console.log(this.contractId)
},
//查看文件
checkFile() {
checkFile(url, id) {
console.log('查看pdf')
console.log(url)
console.log(id)
uni.navigateTo({
url:'/pagesA/Contracts/attachment/attachment'
url: '/pagesA/Contracts/attachment/attachment?appendix=' + url + '&id=' + id
})
},
//按钮取消
cancle(){
cancle() {
this.dialogShow = false
},
//按钮确定
confirm() {
this.dialogShow = false
get(api.inquiryChooseContract,{
contractId:this.contractId,
inquiryId:this.inquiryId
}).then(res=>{
if(res.code==200){
get(api.inquiryChooseContract, {
contractId: this.contractId,
inquiryId: this.inquiryId
}).then(res => {
if (res.code == 200) {
uni.showToast({
title:'操作成功'
title: '操作成功'
})
let urltime=setTimeout(function(){
let urltime = setTimeout(function() {
uni.navigateTo({
url:'../../enquiry/Enquiry'
url: '../../enquiry/Enquiry'
})
},1000)
}else{
}, 1000)
} else {
uni.showToast({
title:res.msg,
icon:'none'
title: res.msg,
icon: 'none'
})
}
})
},
//开具合同
linktoLssueContracts(){
linktoLssueContracts() {
uni.navigateTo({
url:'/pagesA/Contracts/LssueContracts/LssueContracts'
url: '/pagesA/Contracts/LssueContracts/LssueContracts'
})
}
}
......@@ -155,6 +158,7 @@
min-height: 100%;
background-color: #f4f5f7;
padding-bottom: 236rpx;
.button_box {
width: 100%;
height: 236rpx;
......@@ -162,13 +166,13 @@
position: fixed;
left: 0;
bottom: 0;
.button_block {
width: 100%;
height: 136rpx;
padding-top: 32rpx;
box-shadow: 0px -2px 10px 0px rgba(0,0,0,0.08);
box-shadow: 0px -2px 10px 0px rgba(0, 0, 0, 0.08);
button {
color: #fff;
margin: auto;
......@@ -182,6 +186,7 @@
}
}
}
// 弹窗
.Business_dialog {
position: absolute;
......@@ -190,7 +195,7 @@
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.50);
.dialog_box {
position: absolute;
left: 50%;
......@@ -199,12 +204,12 @@
background-color: #fff;
border-radius: 16rpx;
}
// 分成
.dialog_proportion {
width: 560rpx;
height: 290rpx;
.dialog_proportion_text {
display: flex;
flex-direction: column;
......@@ -213,12 +218,12 @@
height: 190rpx;
font-size: 30rpx;
color: #666;
text {
display: block;
}
}
.dialog_proportion_btn {
height: 100rpx;
line-height: 100rpx;
......@@ -229,11 +234,11 @@
border-top: 1rpx solid #f4f5f7;
}
}
// 联系
.dialog_iphone {
width: 560rpx;
.dialog_iphone_hint {
height: 84rpx;
line-height: 84rpx;
......@@ -241,7 +246,7 @@
font-size: 28rpx;
color: #333;
}
.dialog_iphone_number {
height: 190rpx;
line-height: 190rpx;
......@@ -249,12 +254,12 @@
font-size: 30rpx;
color: #666;
}
.dialog_iphone_btns {
display: flex;
height: 100rpx;
border-top: 1rpx solid #f4f5f7;
view {
flex: 1;
text-align: center;
......@@ -263,17 +268,18 @@
font-weight: 500;
color: #999;
}
.confirm {
border-left: 1rpx solid #f4f5f7;
color: #1989fa;
}
}
}
}
// 提示信息
.contract_hint {
height: 68rpx;
......
static/util/api.js
浏览文件 @ c3d0eb9b
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/common/vendor.js
浏览文件 @ c3d0eb9b
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/build/mp-weixin/pagesA/Contracts/contract/contract.js
浏览文件 @ c3d0eb9b
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/Contracts/contract/contract"],{1478:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("86df"),c=a(e("9036"));function a(t){return t&&t.__esModule?t:{default:t}}var i={data:function(){return{dialogShow:!1,contract:"",contractdata:[],electricId:"",contractId:"",inquiryId:"",year:""}},onLoad:function(n){n&&(console.log(n),this.inquiryId=n.inquiryId,this.year=n.year);var e=this;this.electricId=t.getStorageSync("user").electricId,(0,o.get)(c.default.inquiryChooseContractList,{userId:this.electricId,year:this.year}).then((function(n){200==n.code?e.contractdata=n.data:t.showToast({title:n.msg,icon:"none"})}))},created:function(){},methods:{getContract:function(t){console.log(t),this.dialogShow=!0,this.contractId=t.detail.value,console.log(this.contractId)},checkFile:function(){console.log("查看pdf"),t.navigateTo({url:"/pagesA/Contracts/attachment/attachment"})},cancle:function(){this.dialogShow=!1},confirm:function(){this.dialogShow=!1,(0,o.get)(c.default.inquiryChooseContract,{contractId:this.contractId,inquiryId:this.inquiryId}).then((function(n){if(200==n.code){t.showToast({title:"操作成功"});setTimeout((function(){t.navigateTo({url:"../../enquiry/Enquiry"})}),1e3)}else t.showToast({title:n.msg,icon:"none"})}))},linktoLssueContracts:function(){t.navigateTo({url:"/pagesA/Contracts/LssueContracts/LssueContracts"})}}};n.default=i}).call(this,e("543d")["default"])},1874:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var c=function(){var t=this,n=t.$createElement;t._self._c},a=[]},"1ded":function(t,n,e){},"5ca3":function(t,n,e){"use strict";e.r(n);var o=e("1874"),c=e("f8f6");for(var a in c)"default"!==a&&function(t){e.d(n,t,(function(){return c[t]}))}(a);e("5fc5");var i,r=e("f0c5"),u=Object(r["a"])(c["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],i);n["default"]=u.exports},"5f5f":function(t,n,e){"use strict";(function(t){e("78ef");o(e("66fd"));var n=o(e("5ca3"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])},"5fc5":function(t,n,e){"use strict";var o=e("1ded"),c=e.n(o);c.a},f8f6:function(t,n,e){"use strict";e.r(n);var o=e("1478"),c=e.n(o);for(var a in o)"default"!==a&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=c.a}},[["5f5f","common/runtime","common/vendor"]]]);
\ No newline at end of file
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/Contracts/contract/contract"],{1478:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("86df"),c=a(e("9036"));function a(t){return t&&t.__esModule?t:{default:t}}var i={data:function(){return{dialogShow:!1,contract:"",contractdata:[],electricId:"",contractId:"",inquiryId:"",year:""}},onLoad:function(n){n&&(console.log(n),this.inquiryId=n.inquiryId,this.year=n.year);var e=this;this.electricId=t.getStorageSync("user").electricId,(0,o.get)(c.default.inquiryChooseContractList,{userId:this.electricId,year:this.year}).then((function(n){200==n.code?e.contractdata=n.data:t.showToast({title:n.msg,icon:"none"})}))},created:function(){},methods:{getContract:function(t){console.log(t),this.dialogShow=!0,this.contractId=t.detail.value,console.log(this.contractId)},checkFile:function(n,e){console.log("查看pdf"),console.log(n),console.log(e),t.navigateTo({url:"/pagesA/Contracts/attachment/attachment?appendix="+n+"&id="+e})},cancle:function(){this.dialogShow=!1},confirm:function(){this.dialogShow=!1,(0,o.get)(c.default.inquiryChooseContract,{contractId:this.contractId,inquiryId:this.inquiryId}).then((function(n){if(200==n.code){t.showToast({title:"操作成功"});setTimeout((function(){t.navigateTo({url:"../../enquiry/Enquiry"})}),1e3)}else t.showToast({title:n.msg,icon:"none"})}))},linktoLssueContracts:function(){t.navigateTo({url:"/pagesA/Contracts/LssueContracts/LssueContracts"})}}};n.default=i}).call(this,e("543d")["default"])},"1ded":function(t,n,e){},"5ca3":function(t,n,e){"use strict";e.r(n);var o=e("9765"),c=e("f8f6");for(var a in c)"default"!==a&&function(t){e.d(n,t,(function(){return c[t]}))}(a);e("5fc5");var i,r=e("f0c5"),u=Object(r["a"])(c["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],i);n["default"]=u.exports},"5f5f":function(t,n,e){"use strict";(function(t){e("78ef");o(e("66fd"));var n=o(e("5ca3"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])},"5fc5":function(t,n,e){"use strict";var o=e("1ded"),c=e.n(o);c.a},9765:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var c=function(){var t=this,n=t.$createElement;t._self._c},a=[]},f8f6:function(t,n,e){"use strict";e.r(n);var o=e("1478"),c=e.n(o);for(var a in o)"default"!==a&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=c.a}},[["5f5f","common/runtime","common/vendor"]]]);
\ No newline at end of file
unpackage/dist/build/mp-weixin/pagesA/Contracts/contract/contract.wxml
浏览文件 @ c3d0eb9b
<view class="contract"><block wx:if="{{dialogShow}}"><view class="Business_dialog"><block wx:if="{{dialogShow}}"><view class="dialog_iphone dialog_box"><view class="dialog_iphone_number">确定选择该合同</view><view class="dialog_iphone_btns"><view data-event-opts="{{[['tap',[['cancle',['$event']]]]]}}" class="cancle" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="confirm" bindtap="__e">确定</view></view></view></block></view></block><block wx:if="{{!dialogShow}}"><view><view class="contract_hint">温馨提示：只能选择已绑定企业,并且企业认证通过的合同</view><view class="contract_main"><radio-group class="radio_group" name data-event-opts="{{[['change',[['getContract',['$event']]]]]}}" bindchange="__e"><block wx:for="{{contractdata}}" wx:for-item="item" wx:for-index="__i0__" wx:key="*this"><label><view class="contract_item"><radio value="{{item.id}}" color="#1989fa" checked="{{contractId==item.id?true:false}}"></radio><view class="contract_item_info"><view>{{"合同编号："+item.contractNumber}}</view><view>{{"合同甲方："+item.contractA}}</view><view>{{"合同乙方："+item.contractB}}</view><view>{{"合同电量："+item.electricity+"万kWh"}}</view><block wx:if="{{item.contractType==1}}"><view>合同类型：固定价差</view></block><block wx:if="{{item.contractType==3}}"><view>合同类型：月竞分成</view></block><block wx:if="{{item.contractType==1}}"><view>{{"合同价差："+item.fixedSpread+"分"}}</view></block><block wx:if="{{item.contractType==3}}"><view>{{"分成比例："+item.shareRatio}}</view></block><view>{{"合同期限："+item.contractStartTime+" - "+item.contractEndTime}}</view><view>合同附件：<block wx:if="{{item.contractAnnex!=null}}"><text data-event-opts="{{[['tap',[['checkFile',['$event']]]]]}}" style="color:#1989fa;" catchtap="__e">点击查看</text></block><block wx:else><text>无</text></block></view></view></view></label></block></radio-group></view><view class="button_box"><view class="button_block"><button type="default" data-event-opts="{{[['tap',[['linktoLssueContracts',['$event']]]]]}}" bindtap="__e">上传合同</button></view></view></view></block></view>
\ No newline at end of file
<view class="contract"><block wx:if="{{dialogShow}}"><view class="Business_dialog"><block wx:if="{{dialogShow}}"><view class="dialog_iphone dialog_box"><view class="dialog_iphone_number">确定选择该合同</view><view class="dialog_iphone_btns"><view data-event-opts="{{[['tap',[['cancle',['$event']]]]]}}" class="cancle" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="confirm" bindtap="__e">确定</view></view></view></block></view></block><block wx:if="{{!dialogShow}}"><view><view class="contract_hint">温馨提示：只能选择已绑定企业,并且企业认证通过的合同</view><view class="contract_main"><radio-group class="radio_group" name data-event-opts="{{[['change',[['getContract',['$event']]]]]}}" bindchange="__e"><block wx:for="{{contractdata}}" wx:for-item="item" wx:for-index="index" wx:key="index"><label><view class="contract_item"><radio value="{{item.id}}" color="#1989fa" checked="{{contractId==item.id?true:false}}"></radio><view class="contract_item_info"><view>{{"合同编号："+item.contractNumber}}</view><view>{{"合同甲方："+item.contractA}}</view><view>{{"合同乙方："+item.contractB}}</view><view>{{"合同电量："+item.electricity+"万kWh"}}</view><block wx:if="{{item.contractType==1}}"><view>合同类型：固定价差</view></block><block wx:if="{{item.contractType==3}}"><view>合同类型：月竞分成</view></block><block wx:if="{{item.contractType==1}}"><view>{{"合同价差："+item.fixedSpread+"分"}}</view></block><block wx:if="{{item.contractType==3}}"><view>{{"分成比例："+item.shareRatio}}</view></block><view>{{"合同期限："+item.contractStartTime+" - "+item.contractEndTime}}</view><view>合同附件：<block wx:if="{{item.contractAnnex!=null}}"><text data-event-opts="{{[['tap',[['checkFile',['$0','$1'],[[['contractdata','',index,'contractAnnex']],[['contractdata','',index,'id']]]]]]]}}" style="color:#1989fa;" catchtap="__e">点击查看</text></block><block wx:else><text>无</text></block></view></view></view></label></block></radio-group></view><view class="button_box"><view class="button_block"><button type="default" data-event-opts="{{[['tap',[['linktoLssueContracts',['$event']]]]]}}" bindtap="__e">上传合同</button></view></view></view></block></view>
\ No newline at end of file
unpackage/dist/build/mp-weixin/project.config.json
浏览文件 @ c3d0eb9b
......@@ -41,7 +41,7 @@
},
"compileType": "miniprogram",
"libVersion": "",
"appid": "wx45bb68de16ddddb7",
"appid": "wxb21370ac25ee51b0",
"projectname": "gangshi",
"condition": {
"search": {
......
unpackage/dist/build/mp-weixin/static/util/api.js
浏览文件 @ c3d0eb9b
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' // 登录
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论