Skip to content

G
GangShi-un2
提交 e75b1d6b authored 作者: 彭涛's avatar 彭涛
浏览文件
操作

完成电客选择企业拼包

上级 b6ec4f5d b4248868
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 541 行增加 和 70 行删除
pages/login/login.vue
浏览文件 @ e75b1d6b
......@@ -55,28 +55,23 @@
// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
let scene = decodeURIComponent(options.scene)
that.inviteType=scene.split('&&')[0]
let scene2=scene.split('&&')[1]
//ht=1 scene
that.userId=scene.split('&&')[1]
if(scene2.indexOf('ht')>=0){
that.culiangcontractId=scene2.split('=')[1]
}else{
that.userId=scene2
//获取用户信息
get(api.getUserInformation,{
type:'2',
userId:that.userId
}).then(res=>{
if(res.code==200){
that.inviteCode=res.data.inviteCode
}else{
uni.showToast({
title:res.msg,
icon:'none',
duration:1200
})
}
})
}
//获取用户信息
get(api.getUserInformation,{
type:'2',
userId:that.userId
}).then(res=>{
if(res.code==200){
that.inviteCode=res.data.inviteCode
}else{
uni.showToast({
title:res.msg,
icon:'none',
duration:1200
})
}
})
}else{
that.inviteType = options.inviteType
......
pages/register/register.vue
浏览文件 @ e75b1d6b
......@@ -231,6 +231,13 @@
this.inviteType = options.inviteType
this.contractId = options.contractId
}
//存量企业
if(options.scene){
let scene = decodeURIComponent(options.scene)
this.scene=scene.split('=')[1]
this.inviteType=2
this.type=1
}
console.log('接受邀请的合同id=', this.contractId)
},
components: {
......@@ -250,6 +257,7 @@
clauseShow: false, //协议弹窗
code: '', //发送之后获取的验证码
count: 60, //60s倒计时
scene:'',//存量企业
}
},
methods: {
......@@ -368,7 +376,8 @@
type: this.type,
wxName: this.wxName,
address: this.address,
headImgUrl: this.headImgUrl
headImgUrl: this.headImgUrl,
scene: this.scene
}).then(res => {
console.log(res)
if (res.code == 200) {
......
static/util/api.js
浏览文件 @ e75b1d6b
const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
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/' // 正式
......
unpackage/dist/build/mp-weixin/app.json
浏览文件 @ e75b1d6b
......@@ -21,6 +21,7 @@
"pages/ChooseEnterprise/ChooseEnterprise",
"pages/clearing/Clearing",
"pages/Earnings/betweenEarnings/betweenEarnings",
"pages/Earnings/service/service",
"pages/Earnings/affirmEarnings/affirmEarnings",
"pages/Earnings/CashEarnings/CashEarnings",
"pages/phone/phone",
......
unpackage/dist/build/mp-weixin/pages/Earnings/service/service.js 0 → 100644
浏览文件 @ e75b1d6b
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/Earnings/service/service"],{"069f":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=n("86df"),r=a(n("9036")),i=a(n("57ea"));function a(e){return e&&e.__esModule?e:{default:e}}var u={data:function(){return{month:"",year:"",CumulativeMoney:"",WaitingMoney:"",PaymentMoney:"",preSettlement:"",preSettlementDate:"",value1:0,value2:0,options1:[],options2:[],type:"",userId:"",discountsList:[]}},created:function(){var t=this;t.options1=(0,o.getNearbyFiveears)(),t.options2=i.default,t.type=e.getStorageSync("type"),"1"==t.type?t.userId=e.getStorageSync("user").enterpriseId:"2"==t.type&&(t.userId=e.getStorageSync("user").electricId),t.getAllIncome(t.userId,t.type),t.getunConfirmedIncomeEnterpriseList(),(0,o.get)(r.default.getPreSettlementData,{userId:t.userId,userType:t.type}).then((function(e){200==e.code&&(t.preSettlement=e.data.settlementAmount+"",t.preSettlementDate=e.data.date,console.log(t.preSettlementDate))}))},computed:{advanceDate:function(){return this.preSettlementDate.slice(5)}},methods:{open:function(e){this.clickIndex=e,this.$refs.uDropdown.highlight()},close:function(e){this.$refs.uDropdown.highlight(e)},clickDropdownItem:function(e){var t=this;console.log(this.options1[e].label),t.year=0==e?"":this.options1[e].label,t.getunConfirmedIncomeEnterpriseList()},clickDropdownItem2:function(e){var t=this;console.log(this.options2[e].label);var n=e;if(n<10&&(n="0"+n),0==e)t.month="";else if(""==t.year&&0!=e){var o=new Date,r=o.getFullYear();t.month=r+"-"+n}else t.month=t.year+"-"+n;t.getunConfirmedIncomeEnterpriseList()},getAllIncome:function(t,n){var i=this;(0,o.get)(r.default.getAllIncome,{userId:t,type:n}).then((function(t){200==t.code?(i.CumulativeMoney=t.data.spotCumulativeIncome2,i.WaitingMoney=t.data.spotPaymentIncome2,i.PaymentMoney=t.data.spotPaidIncome2):e.showToast({title:t.msg,icon:"none"})}))},getunConfirmedIncomeEnterpriseList:function(){var e=this;(0,o.get)(r.default.unConfirmedIncomeEnterpriseList,{year:this.year,month:this.month,type:1,userId:this.userId,userType:this.type}).then((function(t){200==t.code?e.discountsList=t.data:console.log(t.msg)}))},previewImage:function(t){(0,o.get)(r.default.paymentVoucher,{id:t}).then((function(t){200==t.code?e.previewImage({urls:t.data}):e.showToast({title:t.msg,icon:"none"})}))},linkto:function(t){var n=e.getStorageSync("type");"1"==n?e.navigateTo({url:"/pages/clearing/Clearing?month="+t+"&type=1"}):"2"==n&&e.navigateTo({url:"/pages/ChooseEnterprise/ChooseEnterprise?month="+t+"&type=1"})},linktoSettlement:function(t){var n=e.getStorageSync("type");1==n?e.navigateTo({url:"/pages/clearing/Clearing??type=100&date="+t}):e.navigateTo({url:"/pages/ChooseEnterprise/ChooseEnterprise?type=100&date="+t})}}};t.default=u}).call(this,n("543d")["default"])},2451:function(e,t,n){"use strict";var o=n("c376"),r=n.n(o);r.a},"4af3":function(e,t,n){"use strict";(function(e){n("78ef");o(n("66fd"));var t=o(n("d8b1"));function o(e){return e&&e.__esModule?e:{default:e}}e(t.default)}).call(this,n("543d")["createPage"])},"6cf2":function(e,t,n){"use strict";n.r(t);var o=n("069f"),r=n.n(o);for(var i in o)"default"!==i&&function(e){n.d(t,e,(function(){return o[e]}))}(i);t["default"]=r.a},"9d3f":function(e,t,n){"use strict";n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return i})),n.d(t,"a",(function(){return o}));var o={uDropdown:function(){return n.e("uview-ui/components/u-dropdown/u-dropdown").then(n.bind(null,"2279"))},uDropdownItem:function(){return n.e("uview-ui/components/u-dropdown-item/u-dropdown-item").then(n.bind(null,"6068"))}},r=function(){var e=this,t=e.$createElement;e._self._c},i=[]},c376:function(e,t,n){},d8b1:function(e,t,n){"use strict";n.r(t);var o=n("9d3f"),r=n("6cf2");for(var i in r)"default"!==i&&function(e){n.d(t,e,(function(){return r[e]}))}(i);n("2451");var a,u=n("f0c5"),s=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);t["default"]=s.exports}},[["4af3","common/runtime","common/vendor"]]]);
\ No newline at end of file
unpackage/dist/build/mp-weixin/pages/Earnings/service/service.json 0 → 100644
浏览文件 @ e75b1d6b
{
"navigationBarTitleText": "服务费收益",
"enablePullDownRefresh": false,
"usingComponents": {
"u-dropdown": "/uview-ui/components/u-dropdown/u-dropdown",
"u-dropdown-item": "/uview-ui/components/u-dropdown-item/u-dropdown-item"
}
}
\ No newline at end of file
unpackage/dist/build/mp-weixin/pages/Earnings/service/service.wxml 0 → 100644
浏览文件 @ e75b1d6b
<view class="ReturnsDetailed"><view class="lable"><view class="lable_block"><view class="title">累计收益</view><view class="money"><text>{{"￥"+(CumulativeMoney?CumulativeMoney:'0.00')}}</text></view></view><view class="lable_block"><view class="title">待打款收益</view><view class="money"><text>{{"￥"+(WaitingMoney?WaitingMoney:'0.00')}}</text></view></view><view class="lable_block"><view class="title">已打款收益</view><view class="money"><text>{{"￥"+(PaymentMoney?PaymentMoney:'0.00')}}</text></view></view></view><view class="select"><u-dropdown vue-id="12234c90-1" bind:__l="__l" vue-slots="{{['default']}}"><u-dropdown-item vue-id="{{('12234c90-2')+','+('12234c90-1')}}" title="年份" options="{{options1}}" height="500rpx" value="{{value1}}" data-event-opts="{{[['^change',[['clickDropdownItem']]],['^input',[['__set_model',['','value1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l"></u-dropdown-item><u-dropdown-item vue-id="{{('12234c90-3')+','+('12234c90-1')}}" title="月份" options="{{options2}}" height="500rpx" value="{{value2}}" data-event-opts="{{[['^change',[['clickDropdownItem2']]],['^input',[['__set_model',['','value2','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l"></u-dropdown-item></u-dropdown></view><view class="list_all"><block wx:for="{{discountsList}}" wx:for-item="i" wx:for-index="index" wx:key="index"><view class="list"><view data-event-opts="{{[['tap',[['linkto',['$0'],[[['discountsList','',index,'month']]]]]]]}}" class="betweenEarnings_item" bindtap="__e"><view class="item_title"><view>{{"现货收益("+i.month+")"}}</view><view class="time">{{i.settleDate}}</view></view><view class="item_money"><view>{{"收益金额: ￥"+i.paymentAmount}}</view><view class="state"><block wx:if="{{i.status==1}}"><text class="red">待打款</text></block><block wx:else><text>已打款</text></block></view></view></view><block wx:if="{{i.status!=1}}"><view class="button_all"><view class="hexian"></view><view data-event-opts="{{[['tap',[['linkto',['$0'],[[['discountsList','',index,'settleDate']]]]]]]}}" class="button_box" bindtap="__e">收益明细</view><view data-event-opts="{{[['tap',[['previewImage',['$0'],[[['discountsList','',index,'id']]]]]]]}}" class="button_box" bindtap="__e">打款凭证</view></view></block></view></block></view></view>
\ No newline at end of file
unpackage/dist/build/mp-weixin/pages/Earnings/service/service.wxss 0 → 100644
浏览文件 @ e75b1d6b
.ReturnsDetailed{width:100%;min-height:100%;padding-top:32rpx;background:#f4f5f7}.ReturnsDetailed .Recently{width:100%;text-align:center;padding-bottom:32rpx;background-color:#fff}.ReturnsDetailed .Recently .border_raduis{padding:10rpx 32rpx;border:2rpx solid #1989fa;-webkit-border-radius:32rpx;border-radius:32rpx;color:#1989fa;text-align:center}.ReturnsDetailed .lable{width:100%;background:#fff;padding:32rpx;display:-webkit-box;display:flex;display:-moz-flex;display:-ms-flex;display:-o-flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.ReturnsDetailed .lable .lable_block{width:221rpx;height:146rpx;margin-left:11rpx;background:#f2f7ff;-webkit-border-radius:16rpx;border-radius:16rpx;text-align:center;display:-webkit-box;display:flex;display:-moz-flex;display:-ms-flex;display:-o-flex;display:-webkit-flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.ReturnsDetailed .lable .lable_block .title{color:#666;font-size:24rpx}.ReturnsDetailed .lable .lable_block .money{color:#1989fa;font-size:38rpx;display:-webkit-box;display:flex;display:-moz-flex;display:-ms-flex;display:-o-flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row}.ReturnsDetailed .lable .lable_block .money text{font-size:28rpx}.ReturnsDetailed .lable .lable_block:nth-child(1){margin-left:0}.ReturnsDetailed .list_all{width:100%}.ReturnsDetailed .list_all .list{width:100%;margin-bottom:16rpx}.ReturnsDetailed .list_all .list .button_all{width:100%;background-color:#fff;padding:25rpx 32rpx;display:-webkit-box;display:flex;display:-moz-flex;display:-ms-flex;display:-o-flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row}.ReturnsDetailed .list_all .list .button_all .button_box{width:156rpx;height:60rpx;font-size:24rpx;font-weight:500;text-align:center;color:#1989fa;line-height:60rpx;margin-right:16rpx;font-size:24rpx;border:2rpx solid #1989fa;-webkit-border-radius:10rpx;border-radius:10rpx}.ReturnsDetailed .list_all .list .button_all .button_box:nth-last-child(1){margin:0}.ReturnsDetailed .list_all .list .button_all .hexian{width:100%;height:1px;background-color:#c6c9cc;transform:scaleY(.5);-webkit-transform:scaleY(.5);-moz-transform:scaleY(.5);-o-transform:scaleY(.5);-ms-transform:scaleY(.5);position:absolute;top:0}.ReturnsDetailed .list_all .betweenEarnings_item{padding:32rpx;background-color:#fff}.ReturnsDetailed .list_all .betweenEarnings_item .item_title{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-bottom:16rpx}.ReturnsDetailed .list_all .betweenEarnings_item .item_title view{font-size:24rpx;font-weight:500;color:#666}.ReturnsDetailed .list_all .betweenEarnings_item .item_title .time{font-weight:400;color:#ccc}.ReturnsDetailed .list_all .betweenEarnings_item .item_money{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.ReturnsDetailed .list_all .betweenEarnings_item .item_money view{font-size:24rpx;font-weight:500;color:#666}.ReturnsDetailed .list_all .betweenEarnings_item .item_money image{width:16rpx;height:30rpx}.ReturnsDetailed .list_all .betweenEarnings_item .item_money .state{font-size:24rpx;color:#999}.ReturnsDetailed .list_all .betweenEarnings_item .item_money .state .red{color:#ec6045}
\ No newline at end of file
unpackage/dist/build/mp-weixin/pagesA/electriCompany/electriCompany.js
浏览文件 @ e75b1d6b
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/electriCompany/electriCompany"],{"0e02":function(t,e,n){"use strict";n.r(e);var a=n("5527"),c=n.n(a);for(var u in a)"default"!==u&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=c.a},"135c":function(t,e,n){"use strict";var a=n("f688"),c=n.n(a);c.a},5527:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=n("a000"),c=u(n("7363"));function u(t){return t&&t.__esModule?t:{default:t}}var r={data:function(){return{electriCompanyList:[]}},created:function(){var e=this;(0,a.get)(c.default.electricitySalesCompanies).then((function(n){200==n.code?e.electriCompanyList=n.data:t.showToast({title:n.msg,icon:"none"})}))},methods:{linktoElectriCompanyDetail:function(e,n,a){t.navigateTo({url:"/pagesA/electriCompany/electriCompanyDetail?userId="+e})}}};e.default=r}).call(this,n("543d")["default"])},"5afa":function(t,e,n){"use strict";(function(t){n("0cf7");a(n("66fd"));var e=a(n("b318"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},"71c3":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return c})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return a}));var c=function(){var t=this,e=t.$createElement;t._self._c},u=[]},b318:function(t,e,n){"use strict";n.r(e);var a=n("71c3"),c=n("0e02");for(var u in c)"default"!==u&&function(t){n.d(e,t,(function(){return c[t]}))}(u);n("135c");var r,i=n("f0c5"),o=Object(i["a"])(c["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],r);e["default"]=o.exports},f688:function(t,e,n){}},[["5afa","common/runtime","common/vendor"]]]);
\ No newline at end of file
<<<<<<< HEAD
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/electriCompany/electriCompany"],{2582:function(t,e,n){"use strict";(function(t){n("78ef");a(n("66fd"));var e=a(n("b3e6"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},"60fd":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=n("86df"),u=c(n("9036"));function c(t){return t&&t.__esModule?t:{default:t}}var r={data:function(){return{electriCompanyList:[]}},created:function(){var e=this;(0,a.get)(u.default.electricitySalesCompanies).then((function(n){200==n.code?e.electriCompanyList=n.data:t.showToast({title:n.msg,icon:"none"})}))},methods:{linktoElectriCompanyDetail:function(e,n,a){t.navigateTo({url:"/pagesA/electriCompany/electriCompanyDetail?userId="+e})}}};e.default=r}).call(this,n("543d")["default"])},"699d":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},c=[]},"730a":function(t,e,n){"use strict";n.r(e);var a=n("60fd"),u=n.n(a);for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);e["default"]=u.a},b3e6:function(t,e,n){"use strict";n.r(e);var a=n("699d"),u=n("730a");for(var c in u)"default"!==c&&function(t){n.d(e,t,(function(){return u[t]}))}(c);n("bc6b");var r,i=n("f0c5"),o=Object(i["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],r);e["default"]=o.exports},bc6b:function(t,e,n){"use strict";var a=n("e7ae"),u=n.n(a);u.a},e7ae:function(t,e,n){}},[["2582","common/runtime","common/vendor"]]]);
=======
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/electriCompany/electriCompany"],{"0e02":function(t,e,n){"use strict";n.r(e);var a=n("5527"),c=n.n(a);for(var u in a)"default"!==u&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=c.a},"135c":function(t,e,n){"use strict";var a=n("f688"),c=n.n(a);c.a},5527:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=n("a000"),c=u(n("7363"));function u(t){return t&&t.__esModule?t:{default:t}}var r={data:function(){return{electriCompanyList:[]}},created:function(){var e=this;(0,a.get)(c.default.electricitySalesCompanies).then((function(n){200==n.code?e.electriCompanyList=n.data:t.showToast({title:n.msg,icon:"none"})}))},methods:{linktoElectriCompanyDetail:function(e,n,a){t.navigateTo({url:"/pagesA/electriCompany/electriCompanyDetail?userId="+e})}}};e.default=r}).call(this,n("543d")["default"])},"5afa":function(t,e,n){"use strict";(function(t){n("0cf7");a(n("66fd"));var e=a(n("b318"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},"71c3":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return c})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return a}));var c=function(){var t=this,e=t.$createElement;t._self._c},u=[]},b318:function(t,e,n){"use strict";n.r(e);var a=n("71c3"),c=n("0e02");for(var u in c)"default"!==u&&function(t){n.d(e,t,(function(){return c[t]}))}(u);n("135c");var r,i=n("f0c5"),o=Object(i["a"])(c["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],r);e["default"]=o.exports},f688:function(t,e,n){}},[["5afa","common/runtime","common/vendor"]]]);
>>>>>>> 3e57a9c4aaa364fcf43a3d257cfdae6fc294ab87
unpackage/dist/build/mp-weixin/pagesA/electriCompany/electriCompanyDetail.js
浏览文件 @ e75b1d6b
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/electriCompany/electriCompanyDetail"],{"25f3":function(e,t,n){"use strict";var a=n("ca80"),i=n.n(a);i.a},3927:function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=n("a000"),i=o(n("7363"));function o(e){return e&&e.__esModule?e:{default:e}}var u={data:function(){return{companydata:"",userId:"",eName:"",Count:"",tabIndex:1,moreIndex:null,moreShow:!1,setmealList:[],Companytimer:"",remainder3:""}},onLoad:function(e){var t=this;e&&(t.userId=e.userId,t.companyPackageList(t.userId),t.companyProfile(t.userId))},methods:{tabClick:function(e){this.tabIndex=e},companyPackageList:function(t){var n=this;(0,a.get)(i.default.companyPackageList,{userId:t}).then((function(t){if(200==t.code){n.setmealList=t.data;var i=[],o=[];t.data.map((function(e){var t=e.packageEndTime.replace("T"," ").replace(".000+0800","").replace(/-/g,"/");i.push((0,a.getDuration)(new Date(t).getTime()-(new Date).getTime())),o.push(new Date(t).getTime()-(new Date).getTime())})),n.Companytimer=setInterval((function(){o.map((function(e,t){o[t]>0&&(o[t]-=1e3,i[t]=(0,a.getDuration)(o[t]),n.remainder3=i)})),n.$forceUpdate()}),1e3)}else e.showToast({title:t.msg,icon:"none"})}))},companyProfile:function(t){var n=this;(0,a.get)(i.default.companyProfile,{userId:t}).then((function(t){200==t.code?n.companydata=t.data:e.showToast({title:t.msg,icon:"none"})}))},getMore:function(e){this.moreIndex=e,this.moreShow=!this.moreShow},linkToGroupInfo:function(t){e.navigateTo({url:"/pages/group/groupInfo?id="+t})},linktoInquiry:function(){e.navigateTo({url:"/pagesA/enquiry/Demand?eName="+this.companydata.eName})}}};t.default=u}).call(this,n("543d")["default"])},"3bc3":function(e,t,n){"use strict";n.r(t);var a=n("3927"),i=n.n(a);for(var o in a)"default"!==o&&function(e){n.d(t,e,(function(){return a[e]}))}(o);t["default"]=i.a},a6b2:function(e,t,n){"use strict";(function(e){n("0cf7");a(n("66fd"));var t=a(n("e60e"));function a(e){return e&&e.__esModule?e:{default:e}}e(t.default)}).call(this,n("543d")["createPage"])},b1b3:function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return i})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){return a}));var i=function(){var e=this,t=e.$createElement,n=(e._self._c,1==e.tabIndex?e.__map(e.setmealList,(function(t,n){var a=e.__get_orig(t),i=1==t.type||2==t.type?t.packageSettingsList.slice(1):null,o=3==t.type?t.packageSettingsList.slice(1):null,u=4==t.type?t.packageSettingsList.slice(1):null,r=5==t.type?t.packageSettingsList.slice(1):null;return{$orig:a,l0:i,l1:o,l2:u,l3:r}})):null);e.$mp.data=Object.assign({},{$root:{l4:n}})},o=[]},ca80:function(e,t,n){},e60e:function(e,t,n){"use strict";n.r(t);var a=n("b1b3"),i=n("3bc3");for(var o in i)"default"!==o&&function(e){n.d(t,e,(function(){return i[e]}))}(o);n("25f3");var u,r=n("f0c5"),c=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],u);t["default"]=c.exports}},[["a6b2","common/runtime","common/vendor"]]]);
\ No newline at end of file
<<<<<<< HEAD
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/electriCompany/electriCompanyDetail"],{"0bf6":function(e,t,n){"use strict";(function(e){n("78ef");a(n("66fd"));var t=a(n("c8e0"));function a(e){return e&&e.__esModule?e:{default:e}}e(t.default)}).call(this,n("543d")["createPage"])},1702:function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return i})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){return a}));var i=function(){var e=this,t=e.$createElement,n=(e._self._c,1==e.tabIndex?e.__map(e.setmealList,(function(t,n){var a=e.__get_orig(t),i=1==t.type||2==t.type?t.packageSettingsList.slice(1):null,o=3==t.type?t.packageSettingsList.slice(1):null,u=4==t.type?t.packageSettingsList.slice(1):null,r=5==t.type?t.packageSettingsList.slice(1):null;return{$orig:a,l0:i,l1:o,l2:u,l3:r}})):null);e.$mp.data=Object.assign({},{$root:{l4:n}})},o=[]},"74b0":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=n("86df"),i=o(n("9036"));function o(e){return e&&e.__esModule?e:{default:e}}var u={data:function(){return{companydata:"",userId:"",eName:"",Count:"",tabIndex:1,moreIndex:null,moreShow:!1,setmealList:[],Companytimer:"",remainder3:""}},onLoad:function(e){var t=this;e&&(t.userId=e.userId,t.companyPackageList(t.userId),t.companyProfile(t.userId))},methods:{tabClick:function(e){this.tabIndex=e},companyPackageList:function(t){var n=this;(0,a.get)(i.default.companyPackageList,{userId:t}).then((function(t){if(200==t.code){n.setmealList=t.data;var i=[],o=[];t.data.map((function(e){var t=e.packageEndTime.replace("T"," ").replace(".000+0800","").replace(/-/g,"/");i.push((0,a.getDuration)(new Date(t).getTime()-(new Date).getTime())),o.push(new Date(t).getTime()-(new Date).getTime())})),n.Companytimer=setInterval((function(){o.map((function(e,t){o[t]>0&&(o[t]-=1e3,i[t]=(0,a.getDuration)(o[t]),n.remainder3=i)})),n.$forceUpdate()}),1e3)}else e.showToast({title:t.msg,icon:"none"})}))},companyProfile:function(t){var n=this;(0,a.get)(i.default.companyProfile,{userId:t}).then((function(t){200==t.code?n.companydata=t.data:e.showToast({title:t.msg,icon:"none"})}))},getMore:function(e){this.moreIndex=e,this.moreShow=!this.moreShow},linkToGroupInfo:function(t){e.navigateTo({url:"/pages/group/groupInfo?id="+t})},linktoInquiry:function(){e.navigateTo({url:"/pagesA/enquiry/Demand?eName="+this.companydata.eName})}}};t.default=u}).call(this,n("543d")["default"])},"900f":function(e,t,n){"use strict";var a=n("e04d"),i=n.n(a);i.a},c0b5:function(e,t,n){"use strict";n.r(t);var a=n("74b0"),i=n.n(a);for(var o in a)"default"!==o&&function(e){n.d(t,e,(function(){return a[e]}))}(o);t["default"]=i.a},c8e0:function(e,t,n){"use strict";n.r(t);var a=n("1702"),i=n("c0b5");for(var o in i)"default"!==o&&function(e){n.d(t,e,(function(){return i[e]}))}(o);n("900f");var u,r=n("f0c5"),c=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],u);t["default"]=c.exports},e04d:function(e,t,n){}},[["0bf6","common/runtime","common/vendor"]]]);
=======
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/electriCompany/electriCompanyDetail"],{"25f3":function(e,t,n){"use strict";var a=n("ca80"),i=n.n(a);i.a},3927:function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=n("a000"),i=o(n("7363"));function o(e){return e&&e.__esModule?e:{default:e}}var u={data:function(){return{companydata:"",userId:"",eName:"",Count:"",tabIndex:1,moreIndex:null,moreShow:!1,setmealList:[],Companytimer:"",remainder3:""}},onLoad:function(e){var t=this;e&&(t.userId=e.userId,t.companyPackageList(t.userId),t.companyProfile(t.userId))},methods:{tabClick:function(e){this.tabIndex=e},companyPackageList:function(t){var n=this;(0,a.get)(i.default.companyPackageList,{userId:t}).then((function(t){if(200==t.code){n.setmealList=t.data;var i=[],o=[];t.data.map((function(e){var t=e.packageEndTime.replace("T"," ").replace(".000+0800","").replace(/-/g,"/");i.push((0,a.getDuration)(new Date(t).getTime()-(new Date).getTime())),o.push(new Date(t).getTime()-(new Date).getTime())})),n.Companytimer=setInterval((function(){o.map((function(e,t){o[t]>0&&(o[t]-=1e3,i[t]=(0,a.getDuration)(o[t]),n.remainder3=i)})),n.$forceUpdate()}),1e3)}else e.showToast({title:t.msg,icon:"none"})}))},companyProfile:function(t){var n=this;(0,a.get)(i.default.companyProfile,{userId:t}).then((function(t){200==t.code?n.companydata=t.data:e.showToast({title:t.msg,icon:"none"})}))},getMore:function(e){this.moreIndex=e,this.moreShow=!this.moreShow},linkToGroupInfo:function(t){e.navigateTo({url:"/pages/group/groupInfo?id="+t})},linktoInquiry:function(){e.navigateTo({url:"/pagesA/enquiry/Demand?eName="+this.companydata.eName})}}};t.default=u}).call(this,n("543d")["default"])},"3bc3":function(e,t,n){"use strict";n.r(t);var a=n("3927"),i=n.n(a);for(var o in a)"default"!==o&&function(e){n.d(t,e,(function(){return a[e]}))}(o);t["default"]=i.a},a6b2:function(e,t,n){"use strict";(function(e){n("0cf7");a(n("66fd"));var t=a(n("e60e"));function a(e){return e&&e.__esModule?e:{default:e}}e(t.default)}).call(this,n("543d")["createPage"])},b1b3:function(e,t,n){"use strict";var a;n.d(t,"b",(function(){return i})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){return a}));var i=function(){var e=this,t=e.$createElement,n=(e._self._c,1==e.tabIndex?e.__map(e.setmealList,(function(t,n){var a=e.__get_orig(t),i=1==t.type||2==t.type?t.packageSettingsList.slice(1):null,o=3==t.type?t.packageSettingsList.slice(1):null,u=4==t.type?t.packageSettingsList.slice(1):null,r=5==t.type?t.packageSettingsList.slice(1):null;return{$orig:a,l0:i,l1:o,l2:u,l3:r}})):null);e.$mp.data=Object.assign({},{$root:{l4:n}})},o=[]},ca80:function(e,t,n){},e60e:function(e,t,n){"use strict";n.r(t);var a=n("b1b3"),i=n("3bc3");for(var o in i)"default"!==o&&function(e){n.d(t,e,(function(){return i[e]}))}(o);n("25f3");var u,r=n("f0c5"),c=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],u);t["default"]=c.exports}},[["a6b2","common/runtime","common/vendor"]]]);
>>>>>>> 3e57a9c4aaa364fcf43a3d257cfdae6fc294ab87
unpackage/dist/dev/mp-weixin/common/vendor.js
浏览文件 @ e75b1d6b
......@@ -16433,8 +16433,8 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
var DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
var 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/' // 正式
......
unpackage/dist/dev/mp-weixin/pages/login/login.js
浏览文件 @ e75b1d6b
......@@ -216,21 +216,16 @@ var _fun = __webpack_require__(/*! ../../static/util/fun.js */ 50);function _int
//
var _default = { onLoad: function onLoad(options) {uni.hideHomeButton();var that = this;console.log(options); //有scene从分享海报邀请进来的
if (options.scene) {// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
var scene = decodeURIComponent(options.scene);that.inviteType = scene.split('&&')[0];var scene2 = scene.split('&&')[1];that.userId = scene.split('&&')[1];if (scene2.indexOf('ht') >= 0) {that.culiangcontractId = scene2.split('=')[1];} else {that.userId = scene2; //获取用户信息
(0, _fun.get)(_api.default.getUserInformation, { type: '2', userId: that.userId }).then(function (res) {if (res.code == 200) {that.inviteCode = res.data.inviteCode;} else {uni.showToast({ title: res.msg, icon: 'none', duration: 1200 });}});}} else {that.inviteType = options.inviteType;that.inviteCode = options.inviteCode;}this.contractId = options.contractId;this.inviterUserId = options.inviterUserId ? options.inviterUserId : '';this.roleId = options.roleId ? options.roleId : ''; // this.roleId = 19
var scene = decodeURIComponent(options.scene);that.inviteType = scene.split('&&')[0]; //ht=1 scene
that.userId = scene.split('&&')[1]; //获取用户信息
(0, _fun.get)(_api.default.getUserInformation, { type: '2', userId: that.userId }).then(function (res) {if (res.code == 200) {that.inviteCode = res.data.inviteCode;} else {uni.showToast({ title: res.msg, icon: 'none', duration: 1200 });}});} else {that.inviteType = options.inviteType;that.inviteCode = options.inviteCode;}this.contractId = options.contractId;this.inviterUserId = options.inviterUserId ? options.inviterUserId : '';this.roleId = options.roleId ? options.roleId : ''; // this.roleId = 19
// this.inviterUserId = 132
if (this.inviteType || this.inviterUserId || this.roleId) {
this.isCreated = false;
}
// console.log('inviteType:', this.inviteType)
if (this.inviteType || this.inviterUserId || this.roleId) {this.isCreated = false;} // console.log('inviteType:', this.inviteType)
// console.log('inviteCode:', this.inviteCode)
// console.log('contractId:', this.contractId)
// console.log('inviterUserId:', this.inviterUserId)
// console.log('roleId:', this.roleId)
},
data: function data() {
return {
}, data: function data() {return {
inviteType: '', //电客发出邀请， 1：电客邀请成为普通会员企业，2：电客邀请成为存量企业，3：电客邀请成为高级会员，4：电客邀请成为电客
inviteCode: '', //电客邀请码
contractId: null, // 电客邀请企业的合同id
......
unpackage/dist/dev/mp-weixin/pages/register/register.js
浏览文件 @ e75b1d6b
......@@ -392,6 +392,13 @@ var _fun = __webpack_require__(/*! ../../static/util/fun.js */ 50);function _int
this.inviteType = options.inviteType;
this.contractId = options.contractId;
}
//存量企业
if (options.scene) {
var scene = decodeURIComponent(options.scene);
this.scene = scene.split('=')[1];
this.inviteType = 2;
this.type = 1;
}
console.log('接受邀请的合同id=', this.contractId);
},
components: {
......@@ -410,7 +417,8 @@ var _fun = __webpack_require__(/*! ../../static/util/fun.js */ 50);function _int
radioCheck: false, // 协议按钮
clauseShow: false, //协议弹窗
code: '', //发送之后获取的验证码
count: 60 //60s倒计时
count: 60, //60s倒计时
scene: '' //存量企业
};
},
methods: {
......@@ -529,7 +537,8 @@ var _fun = __webpack_require__(/*! ../../static/util/fun.js */ 50);function _int
type: this.type,
wxName: this.wxName,
address: this.address,
headImgUrl: this.headImgUrl }).
headImgUrl: this.headImgUrl,
scene: this.scene }).
then(function (res) {
console.log(res);
if (res.code == 200) {
......
unpackage/dist/dev/mp-weixin/static/util/api.js
浏览文件 @ e75b1d6b
const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
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/' // 正式
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论