update
This commit is contained in:
parent
3f9b827c89
commit
7a04d86b0c
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view v-if="data">
|
||||
<view v-show="!showPopupBottom">
|
||||
<view class="content-title">商户门店状态变更申请</view>
|
||||
<view class="content-title">日结账期作废申请</view>
|
||||
<p class="box-top">
|
||||
<view class="item-title">日期：<text style="color:#333;font-size:24rpx;">{{data.OPERATE_DATE}}</text></view>
|
||||
<text style="color:#F27B4C;font-size:24rpx;">{{stateEmun[data.PERMISSIONAPPLY_STATE]}}</text>
|
||||
@ -37,11 +37,11 @@
|
||||
</view>
|
||||
<view class="card">
|
||||
<view class="dataAppoved">
|
||||
<h2 style="font-weight: 700">营收详情</h2>
|
||||
<!-- <h2 style="font-weight: 700">营收详情</h2>-->
|
||||
<view class="top">
|
||||
<view class="left">
|
||||
<span :class="{'scan-ico':effectiveDetail.SCAN_TYPE===1,'shouchi-ico':effectiveDetail.SCAN_TYPE===2,'jiekou-ico':effectiveDetail.SCAN_TYPE===3}">{{effectiveDetail.SHOPNAME}}</span>
|
||||
<span style="color: #979797;">{{effectiveDetail.SERVERPART_NAME}}</span>
|
||||
<span>{{effectiveDetail.SERVERPART_NAME}}</span>
|
||||
</view>
|
||||
<view class="right">
|
||||
<span class="fourth-name">结账人员：</span>{{effectiveDetail.WORKER_NAME?effectiveDetail.WORKER_NAME:''}}
|
||||
@ -103,7 +103,7 @@
|
||||
<div style="color:#fff">-</div>
|
||||
<div class="commodityContent-cashpay">
|
||||
<span class="wid70">实收金额：</span>
|
||||
<view class="cashpay" >{{effectiveDetail.CASHPAY?effectiveDetail.CASHPAY:''}}元</view>
|
||||
<view class="cashpay" >{{effectiveDetail.CASHPAY?effectiveDetail.CASHPAY:'0'}}元</view>
|
||||
</div>
|
||||
</div>
|
||||
</view>
|
||||
@ -238,6 +238,9 @@ export default {
|
||||
console.log('newVal',newVal)
|
||||
console.log('oldVal',oldVal)
|
||||
}
|
||||
},
|
||||
onLoad(){
|
||||
|
||||
},
|
||||
methods: {
|
||||
checkNum(event, s) {
|
||||
|
||||
@ -283,11 +283,18 @@
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
|
||||
console.log('option',option)
|
||||
uni.showLoading()
|
||||
this.pageData = option
|
||||
if (this.pageData.type=='9'){
|
||||
uni.setNavigationBarTitle({
|
||||
title: ' '
|
||||
})
|
||||
}
|
||||
this.loading = true
|
||||
this.getDetail(option)
|
||||
|
||||
this.$forceUpdate()
|
||||
}
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
<text>{{!pageData.isEnd ? '正在加载,请稍后...':'——— 我是有底线的 ———'}}</text>
|
||||
</view>
|
||||
<UniPop :show="showPop" @hidePopup="closePop" type="bottom" @touchmove.prevent round="true">
|
||||
<view class="pb24" style="min-height: 550rpx;">
|
||||
<view class="pb24" style="min-height: 365px;">
|
||||
<!-- <view class="moduleTitle">日期</view>
|
||||
<view class="uni-flex align-center">
|
||||
<view v-for="(d,index) in dateList" :key="index" @click="selectDate(index)" class="tag-item" :class="{'actived':dateIndex==index}">{{d.name}}</view>
|
||||
@ -94,7 +94,7 @@
|
||||
{
|
||||
name: '全部',
|
||||
src: '../../../../../static/images/expense/type/qb.png',
|
||||
typeId: '4,7,8'
|
||||
typeId: '4,7,8,9'
|
||||
},
|
||||
{
|
||||
name: '新增门店',
|
||||
@ -109,7 +109,12 @@
|
||||
name:'资料完善',
|
||||
src: '../../../../../static/images/expense/type/fksp.png',
|
||||
typeId: 8
|
||||
}
|
||||
},
|
||||
{
|
||||
name:'账期作废',
|
||||
src: '../../../../../static/images/expense/type/gcjsd.png',
|
||||
typeId: 9
|
||||
}
|
||||
|
||||
],
|
||||
}
|
||||
|
||||
@ -1,78 +1,84 @@
|
||||
<template>
|
||||
<view class="page-content">
|
||||
|
||||
|
||||
<scroll-view scroll-y="true" @scroll="showFixed" style="height:100%" @scrolltolower="reachBottom()" :style="{'overflow':showPopupMiddle ? 'hidden': 'scroll'}">
|
||||
<div class="fixed-box" :style=" 'transform: translateY('+fixedY+'px);opacity:'+opacity+';'">
|
||||
<view>
|
||||
<view class="center-title">{{sMsg.SERVERPART_NAME}}</view>
|
||||
|
||||
|
||||
<view class="title-clock" style="color: #fff;text-align: center;">{{sMsg.ENDACCOUNT_DATE}}</view>
|
||||
</view>
|
||||
<view>
|
||||
<view class="center-title">日结营收(元）</view>
|
||||
<view class="tab-unit-num " style="color: #fff;text-align: center;">{{sMsg.CASHPAY ? $util.fmoney(sMsg.CASHPAY,2) : '0.00'}}</view>
|
||||
</view>
|
||||
<view>
|
||||
<view>
|
||||
<view class="center-title">待我办理</view>
|
||||
<view class="tab-unit-num " style="color: #fff;text-align: center;">{{sMsg.DEAL_COUNT}}</view>
|
||||
</view>
|
||||
</div>
|
||||
<div class="box-card" v-show="sMsg.SERVERPART_NAME" :style="'opacity:'+(1-opacity)+';'" >
|
||||
<div class="box-top-title">
|
||||
<span class="box-center-title">{{sMsg.SERVERPART_NAME}}</span>
|
||||
<picker mode="date" @columnchange="bindDateColumnChange" @change="bindDateChange" :value="values" :end="pageData.endDate" :start="pageData.startDate" class="title-clock" >
|
||||
<view>{{sMsg.ENDACCOUNT_DATE}} <text class="uni-icon uni-icon-arrowdown"></text></view>
|
||||
</picker>
|
||||
<!-- <span class="title-clock">{{sMsg.ENDACCOUNT_DATE}}</span> -->
|
||||
</div>
|
||||
<view class="top-card">
|
||||
<div class="box-center-box">
|
||||
<span class="center-title">日结营收(元）</span>
|
||||
<span class="center-num">{{sMsg.CASHPAY ? $util.fmoney(sMsg.CASHPAY,2) : '0.00'}}</span>
|
||||
</div>
|
||||
<div class="box-bottom-tab">
|
||||
<view class="tab-unit" style="flex: 3;">
|
||||
|
||||
<span class="tab-icon2" v-if="sMsg.DIFFERENT_PRICE_LESS==0 && sMsg.DIFFERENT_PRICE_MORE!=0">长款金额</span>
|
||||
<span class="tab-icon2" v-else-if="sMsg.DIFFERENT_PRICE_LESS!=0 && sMsg.DIFFERENT_PRICE_MORE==0">短款金额</span>
|
||||
<span class="tab-icon2" v-else>长短款额</span>
|
||||
</view>
|
||||
<view class="tab-unit" style="flex: 2;">
|
||||
<span class="tab-icon1">待我办理</span>
|
||||
</view>
|
||||
<view class="tab-unit" style="flex: 3;">
|
||||
<span class="tab-icon2">在营门店</span>
|
||||
</view>
|
||||
</div>
|
||||
|
||||
<div class="box-bottom-tab">
|
||||
<div class="tab-unit" style="flex: 3;">
|
||||
|
||||
<span class="tab-unit-num priceRed" v-if="sMsg.DIFFERENT_PRICE_LESS!=0">{{sMsg.DIFFERENT_PRICE_LESS}}</span>
|
||||
<span class="tab-unit-num priceGreen" v-if="sMsg.DIFFERENT_PRICE_MORE!=0">{{sMsg.DIFFERENT_PRICE_MORE}}</span>
|
||||
<span class="tab-unit-num " v-if="sMsg.DIFFERENT_PRICE_LESS==0&& sMsg.DIFFERENT_PRICE_MORE==0">0.00</span>
|
||||
</div>
|
||||
<div class="tab-unit" style="flex: 2;">
|
||||
|
||||
<span class="tab-unit-num">{{sMsg.DEAL_COUNT}}</span>
|
||||
</div>
|
||||
<div class="tab-unit" style="flex: 3;" @tap="showPop">
|
||||
|
||||
<span class="weisc-ico" v-if="sMsg.SHOP_UPCOUNT>0">{{sMsg.SHOP_UPCOUNT}}</span>
|
||||
<span class="tab-unit-num " :class="{'more-btn':sMsg.SHOP_UPCOUNT>0}">{{sMsg.SHOP_UPCOUNT>0 ? '/ '+sMsg.SHOP_TCOUNT : sMsg.SHOP_TCOUNT}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</view>
|
||||
<!-- :style="'opacity:'+(1-opacity)+';'" -->
|
||||
<div class="box-card" >
|
||||
<div style="width: 100%;height: 100%" >
|
||||
<div class="box-top-title" style="min-height: 25px">
|
||||
<span class="box-center-title">{{sMsg.SERVERPART_NAME}}</span>
|
||||
<picker mode="date" @columnchange="bindDateColumnChange" @change="bindDateChange" :value="values" :end="pageData.endDate" :start="pageData.startDate" class="title-clock" >
|
||||
<view v-show="sMsg.SERVERPART_NAME">{{sMsg.ENDACCOUNT_DATE || ''}} <text class="uni-icon uni-icon-arrowdown"></text></view>
|
||||
</picker>
|
||||
<!-- <span class="title-clock">{{sMsg.ENDACCOUNT_DATE}}</span> -->
|
||||
</div>
|
||||
<view class="top-card" style="min-height: 150px">
|
||||
<div >
|
||||
<div class="box-center-box" style="min-height: 73px">
|
||||
<span class="center-title">日结营收(元）</span>
|
||||
<span class="center-num" v-if="sMsg.SERVERPART_NAME">{{sMsg.CASHPAY ? $util.fmoney(sMsg.CASHPAY,2) : '0.00'}}</span>
|
||||
<span class="center-num" v-else style="display: block;height: 50px"></span>
|
||||
</div>
|
||||
<div class="box-bottom-tab" style="min-height: 21px">
|
||||
<view class="tab-unit" style="flex: 3;">
|
||||
|
||||
<span class="tab-icon2" v-if="sMsg.DIFFERENT_PRICE_LESS==0 && sMsg.DIFFERENT_PRICE_MORE!=0">长款金额</span>
|
||||
<span class="tab-icon2" v-else-if="sMsg.DIFFERENT_PRICE_LESS!=0 && sMsg.DIFFERENT_PRICE_MORE==0">短款金额</span>
|
||||
<span class="tab-icon2" v-else>长短款额</span>
|
||||
</view>
|
||||
<view class="tab-unit" style="flex: 2;">
|
||||
<span class="tab-icon1">待我办理</span>
|
||||
</view>
|
||||
<view class="tab-unit" style="flex: 3;">
|
||||
<span class="tab-icon2">在营门店</span>
|
||||
</view>
|
||||
</div>
|
||||
|
||||
<div class="box-bottom-tab" style="min-height: 27px">
|
||||
<div class="tab-unit" style="flex: 3;" v-show="sMsg.SERVERPART_NAME">
|
||||
|
||||
<span class="tab-unit-num priceRed" v-if="sMsg.DIFFERENT_PRICE_LESS!=0">{{sMsg.DIFFERENT_PRICE_LESS}}</span>
|
||||
<span class="tab-unit-num priceGreen" v-if="sMsg.DIFFERENT_PRICE_MORE!=0">{{sMsg.DIFFERENT_PRICE_MORE}}</span>
|
||||
<span class="tab-unit-num " v-if="sMsg.DIFFERENT_PRICE_LESS==0&& sMsg.DIFFERENT_PRICE_MORE==0">0.00</span>
|
||||
</div>
|
||||
<div class="tab-unit" style="flex: 2;">
|
||||
|
||||
<span class="tab-unit-num">{{sMsg.DEAL_COUNT}}</span>
|
||||
</div>
|
||||
<div class="tab-unit" style="flex: 3;" @tap="showPop">
|
||||
|
||||
<span class="weisc-ico" v-if="sMsg.SHOP_UPCOUNT>0">{{sMsg.SHOP_UPCOUNT}}</span>
|
||||
<span class="tab-unit-num " :class="{'more-btn':sMsg.SHOP_UPCOUNT>0}">{{sMsg.SHOP_UPCOUNT>0 ? '/ '+sMsg.SHOP_TCOUNT : sMsg.SHOP_TCOUNT}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</view>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div v-if="pageList.length>0">
|
||||
<div class="card" v-for="(item,i) in pageList" @tap="goDetail(item)" :key="i" :class="item.PENDSTATE == 0 ? 'conten-border' : ''">
|
||||
|
||||
|
||||
<div class="uni-flex jc-between" >
|
||||
<p class="contentName">{{item.SHOPNAME}}</p>
|
||||
<text class="typeText" :class="item.TREATMENT_MARKSTATE == '2'|| item.TREATMENT_MARKSTATE == '4'? 'typeText-color' : ''">{{item.TREATMENT_MARK}}</text>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="content-index">{{i+1}}</div>
|
||||
<view class="uni-flex content-box-cashpay jc-end" >
|
||||
<view>
|
||||
@ -88,12 +94,12 @@
|
||||
<text class="content-span">账期：{{item.ENDACCOUNT_STARTDATE}} - {{item.ENDACCOUNT_DATE}}</text>
|
||||
</view>
|
||||
<image :src="cardIcoPath(item.SCAN_TYPE)" mode="aspectFit"></image>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<view v-else-if="pageData.isLoading===false" >
|
||||
<noFound :nodata="pageList.length>0 ? false : true"/>
|
||||
</view>
|
||||
@ -110,7 +116,7 @@
|
||||
</div>
|
||||
</popUp>
|
||||
</scroll-view>
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -132,7 +138,7 @@
|
||||
endDate: nowTime,
|
||||
startDate: startTime
|
||||
},
|
||||
|
||||
|
||||
sMsg:{},
|
||||
fixedY: -68,
|
||||
opacity: 0,
|
||||
@ -140,19 +146,19 @@
|
||||
pageHieght: uni.getSystemInfoSync().windowHeight,
|
||||
pageList:[],
|
||||
unUploadList:[],
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
components:{
|
||||
popUp
|
||||
},
|
||||
|
||||
|
||||
methods: {
|
||||
...mapMutations(['shouldReLoadingList']),
|
||||
bindDateChange(e) {
|
||||
let values = e.detail.value
|
||||
|
||||
|
||||
|
||||
|
||||
this.pageData.pageIndex =1
|
||||
this.pageData.isEnd = false
|
||||
this.pageData.sDate = values.replace(/-/ig,'/')
|
||||
@ -163,24 +169,24 @@
|
||||
this.getHeader()
|
||||
this.getUnUpLoadShops()
|
||||
},
|
||||
|
||||
|
||||
cardIcoPath(type) {
|
||||
|
||||
|
||||
switch (type){
|
||||
case 3:
|
||||
return '/static/images/effective/jkcs.png'
|
||||
case 1:
|
||||
return '/static/images/effective/ewm.png'
|
||||
return '/static/images/effective/ewm.png'
|
||||
case 2:
|
||||
return '/static/images/effective/scj.png'
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
showFixed(e){
|
||||
let options = e.detail
|
||||
|
||||
|
||||
if(options.scrollTop > 95 && options.scrollTop < 162){
|
||||
|
||||
|
||||
this.fixedY = -68+ (options.scrollTop -95)
|
||||
this.opacity = (options.scrollTop -85)/68
|
||||
}else if(options.scrollTop>162){
|
||||
@ -193,46 +199,46 @@
|
||||
this.fixedY = -68
|
||||
this.opacity = 0
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
getList () {
|
||||
let _this = this
|
||||
|
||||
|
||||
_this.$request.$get('GetEndaccountDetails',{
|
||||
|
||||
|
||||
statistical_Date: this.pageData.sDate,
|
||||
Serverpart_Id: this.pageData.SERVERPART_ID,
|
||||
page_Index: this.pageData.pageIndex,
|
||||
page_Size: this.pageData.pageSize,
|
||||
|
||||
|
||||
}).then(res=>{
|
||||
uni.hideLoading()
|
||||
if(!res.Result_Code ||res.Result_Code!='100') return
|
||||
|
||||
|
||||
let list = res.Result_Data.List
|
||||
|
||||
|
||||
_this.pageList = _this.pageData.pageIndex===1 ? list : [..._this.pageList,...list]
|
||||
|
||||
|
||||
if (list.length < _this.pageData.pageSize) {
|
||||
|
||||
|
||||
_this.pageData.isEnd = true
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
},
|
||||
getHeader () {
|
||||
let _this = this
|
||||
_this.$request.$get('GetEndaccountListByDate',{
|
||||
statistical_Date: this.pageData.sDate,
|
||||
Serverpart_Id: this.pageData.SERVERPART_ID
|
||||
|
||||
Serverpart_Id: this.pageData.SERVERPART_ID
|
||||
|
||||
}).then(res=>{
|
||||
|
||||
|
||||
if (res.Result_Data.List && res.Result_Code==100) {
|
||||
let _data = res.Result_Data.List[0]
|
||||
|
||||
|
||||
_data.ENDACCOUNT_DATE = _this.$util.cutDate(_data.ENDACCOUNT_DATE,'MM月DD日')
|
||||
|
||||
|
||||
_data.DIFFERENT_PRICE_LESS = _this.$util.fmoney(_data.DIFFERENT_PRICE_LESS)
|
||||
_data.DIFFERENT_PRICE_MORE = _this.$util.fmoney(_data.DIFFERENT_PRICE_MORE)
|
||||
_this.sMsg = _data
|
||||
@ -240,8 +246,8 @@
|
||||
_this.getUnUpLoadShops()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
})
|
||||
},
|
||||
goDetail(item){
|
||||
@ -251,14 +257,14 @@
|
||||
getUnUpLoadShops(){
|
||||
let _this = this
|
||||
_this.$request.$get('GetUnUpLoadShops',{
|
||||
|
||||
|
||||
action_record: _this.pageData.sDate,
|
||||
Serverpart_Id: _this.pageData.SERVERPART_ID
|
||||
}).then(res => {
|
||||
let _data = res.Result_Data
|
||||
|
||||
|
||||
_this.unUploadList = _data.List
|
||||
|
||||
|
||||
})
|
||||
},
|
||||
reachBottom () {
|
||||
@ -269,7 +275,7 @@
|
||||
}
|
||||
},
|
||||
showPop(){
|
||||
|
||||
|
||||
if(this.sMsg.SHOP_UPCOUNT>0){
|
||||
this.showPopupMiddle = true
|
||||
}
|
||||
@ -290,7 +296,7 @@
|
||||
uni.stopPullDownRefresh()
|
||||
}, 1000)
|
||||
},
|
||||
|
||||
|
||||
onReachBottom() {
|
||||
this.reachBottom()
|
||||
},
|
||||
@ -299,13 +305,13 @@
|
||||
uni.showLoading({
|
||||
title:'正在加载'
|
||||
})
|
||||
this.pageData.sDate = option.date //"2020/11/26 "
|
||||
this.pageData.sDate = option.date //"2020/11/26 "
|
||||
this.pageData.SERVERPART_ID = option.seviceId
|
||||
this.getList()
|
||||
this.getHeader()
|
||||
|
||||
|
||||
uni.$on('datasummary', function (data){
|
||||
|
||||
|
||||
if(data) {
|
||||
uni.showLoading({
|
||||
title:'正在加载'
|
||||
@ -319,14 +325,14 @@
|
||||
});
|
||||
},
|
||||
onShow() {
|
||||
|
||||
|
||||
},
|
||||
onUnload() {
|
||||
this.$util.addUserBehavior()
|
||||
uni.$off('datasummary');
|
||||
},
|
||||
onHide() {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -398,7 +404,7 @@
|
||||
/* 头部卡片 */
|
||||
.box-card {
|
||||
padding: 24upx 24upx 0;
|
||||
|
||||
|
||||
background-color: #fff;
|
||||
/* box-shadow: 0px 2upx 16upx 0.4upx #e2e2e2; */
|
||||
/* position: fixed;
|
||||
@ -436,7 +442,7 @@
|
||||
color: #A1A1A1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
.more-btn,.weisc-ico {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -453,7 +459,7 @@
|
||||
background: url(../../static/images/effective/sj.png) no-repeat center;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
|
||||
.box-center-title {
|
||||
font-size: 24upx;
|
||||
color: #010101;
|
||||
@ -461,7 +467,7 @@
|
||||
padding: 0 16upx;
|
||||
background-color: #DEDEDE;
|
||||
text-align: center;
|
||||
|
||||
|
||||
}
|
||||
.uni-icon-arrowdown {
|
||||
font-size: 24rpx;
|
||||
@ -486,7 +492,7 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
|
||||
.tab-unit {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -501,13 +507,13 @@
|
||||
color: #DEDEDE;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
|
||||
.tab-unit-num {
|
||||
font-size: 30upx;
|
||||
color: #fff;
|
||||
|
||||
}
|
||||
|
||||
|
||||
.tab-unit-num+.tab-unit-num:before {
|
||||
content: '/';
|
||||
margin: 0 8upx;
|
||||
@ -517,7 +523,7 @@
|
||||
color: #7CB9A5;
|
||||
font-size: 28upx;
|
||||
}
|
||||
|
||||
|
||||
.priceRed,.tab-unit-num.priceRed {
|
||||
color: #D13B3B;
|
||||
font-size: 28upx;
|
||||
@ -554,7 +560,7 @@
|
||||
padding: 24upx 0;
|
||||
font-size: 24upx;
|
||||
align-items: center;
|
||||
|
||||
|
||||
}
|
||||
.pop-row + .pop-row {
|
||||
border-top: 1upx solid #eee;
|
||||
|
||||
@ -290,11 +290,16 @@
|
||||
<div class="check-btn" @click="handleCancel()">作废</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="check-btn-box page-btn-box" v-if="effectiveDetail.TREATMENT_MARKSTATE===2">
|
||||
<div class="check-btn" @click="openCancel()">
|
||||
<span>作废</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="check-btn-box page-btn-box" v-if="isCheck!==0">
|
||||
<!-- 财务审核 -->
|
||||
<template v-if="isCheck==2">
|
||||
<div class="check-btn" @click="openCancel()">
|
||||
<div class="check-btn" @click="openCancel()" v-if="effectiveDetail.TREATMENT_MARKSTATE!==3">
|
||||
<span>作废</span>
|
||||
</div>
|
||||
<div class="check-btn" @click="menuImg(true)">
|
||||
@ -573,6 +578,13 @@
|
||||
},
|
||||
// 作废按钮
|
||||
handleCancel(){
|
||||
if (!this.cancelReason){
|
||||
uni.showModal({
|
||||
title: '请填写作废原因',
|
||||
showCancel: false
|
||||
})
|
||||
return
|
||||
}
|
||||
let _this = this
|
||||
uni.showLoading({
|
||||
title: '正在提交...',
|
||||
|
||||
@ -257,7 +257,7 @@
|
||||
}
|
||||
},
|
||||
async loadMenuSetting(){ //加载首页菜单配置
|
||||
console.log(this.user)
|
||||
console.log('this.user',this.user)
|
||||
this.membershipType = this.user.Membership_Type
|
||||
let res = await this.$request.$webGet("EShangApiMain/APPManage/GetWeChatAppletMenuList",{
|
||||
ModuleStatus: this.membershipType === 9999 ? '1,2' : '1',
|
||||
|
||||
@ -82,13 +82,14 @@
|
||||
uni.getUserInfo({
|
||||
success (res) {
|
||||
let arr = {
|
||||
encryptedData: encodeURIComponent(res.encryptedData),
|
||||
encryptedData: encodeURIComponent(res.encryptedData),
|
||||
iv: encodeURIComponent(res.iv),
|
||||
}
|
||||
console.log('res',res)
|
||||
console.log('arr',arr)
|
||||
// _this.$request.$webPost('WebAPI_Push/WeChat/BusinessLicensed',arr).then(function (rs) {
|
||||
_this.$request.$get('WeChat_BusinessLicensed',arr).then(function (rs) {
|
||||
console.log(rs)
|
||||
_this.$request.$get('WeChat_BusinessLicensed',arr).then((rs)=> {
|
||||
console.log('rs',rs)
|
||||
uni.hideLoading()
|
||||
if(rs.Result_Code==100){
|
||||
let newUser = rs.Result_Data
|
||||
|
||||
34
util/api.js
34
util/api.js
@ -20,7 +20,6 @@ export default {
|
||||
* @return {Promise} promise 返回promise供后续操作
|
||||
*/
|
||||
request: function(method, url, data, isWebApi) {
|
||||
|
||||
var promise = new Promise((resolve, reject) => {
|
||||
//init
|
||||
Store.state.isLoading = true
|
||||
@ -32,25 +31,26 @@ export default {
|
||||
data.WeChat_AppId = 'wxa99ef047735c031e'
|
||||
data.WeChat_MiniProToken = Store.state.userData.WeChat_MiniProToken || ''
|
||||
data.WeChatAppId = 'wxa99ef047735c031e'
|
||||
|
||||
data.memberShipId = !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId // ||'3255' 1170386 1125717 //
|
||||
// ModuleGuid:"60ee4604-0830-4056-931d-d1f7e111810c,1d46081b-6ff8-44d5-9205-31c72bdb4328",
|
||||
let str = ''
|
||||
if (Store.state.userData.AuthorityInfo['1d46081b-6ff8-44d5-9205-31c72bdb4328']===1){
|
||||
str ='1d46081b-6ff8-44d5-9205-31c72bdb4328'
|
||||
}
|
||||
if (Store.state.userData.AuthorityInfo['60ee4604-0830-4056-931d-d1f7e111810c']===1){
|
||||
if (str===''){
|
||||
str = '60ee4604-0830-4056-931d-d1f7e111810c'
|
||||
}else{
|
||||
str +=',60ee4604-0830-4056-931d-d1f7e111810c'
|
||||
if (Store.state.userData.AuthorityInfo){
|
||||
if (Store.state.userData.AuthorityInfo['1d46081b-6ff8-44d5-9205-31c72bdb4328']===1){
|
||||
str ='1d46081b-6ff8-44d5-9205-31c72bdb4328'
|
||||
}
|
||||
}
|
||||
if (Store.state.userData.AuthorityInfo['27109d64-63f9-4bb9-ab90-4c2c92296c73']===1){
|
||||
if (str===''){
|
||||
str = '27109d64-63f9-4bb9-ab90-4c2c92296c73'
|
||||
}else{
|
||||
str +=',27109d64-63f9-4bb9-ab90-4c2c92296c73'
|
||||
if (Store.state.userData.AuthorityInfo['60ee4604-0830-4056-931d-d1f7e111810c']===1){
|
||||
if (str===''){
|
||||
str = '60ee4604-0830-4056-931d-d1f7e111810c'
|
||||
}else{
|
||||
str +=',60ee4604-0830-4056-931d-d1f7e111810c'
|
||||
}
|
||||
}
|
||||
if (Store.state.userData.AuthorityInfo['27109d64-63f9-4bb9-ab90-4c2c92296c73']===1){
|
||||
if (str===''){
|
||||
str = '27109d64-63f9-4bb9-ab90-4c2c92296c73'
|
||||
}else{
|
||||
str +=',27109d64-63f9-4bb9-ab90-4c2c92296c73'
|
||||
}
|
||||
}
|
||||
}
|
||||
if (str===''){
|
||||
@ -76,7 +76,6 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (method == 'POST' && !isWebApi) {
|
||||
requstOptions.header = {
|
||||
'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
|
||||
@ -119,7 +118,6 @@ export default {
|
||||
}
|
||||
} else {
|
||||
//返回错误提示信息
|
||||
console.log(res)
|
||||
reject(res.data);
|
||||
// reject("服务器错误，请稍后重试");
|
||||
}
|
||||
|
||||
@ -2,12 +2,11 @@ import ApiPath from './apiPath'
|
||||
import Api from './api'
|
||||
import Store from '../store/store'
|
||||
export default {
|
||||
|
||||
|
||||
post: function (data) { // 合作商户请求
|
||||
return Api.request('POST', ApiPath.baseURL ,data)
|
||||
},
|
||||
get: function (data) { // 合作商户请求
|
||||
|
||||
return Api.request('GET', ApiPath.baseURL ,data)
|
||||
},
|
||||
// postM: function (control,data) { // 移动业务请求
|
||||
@ -15,7 +14,7 @@ export default {
|
||||
// return Api.request('POST', ApiPath.mobUrl ,data)
|
||||
// },
|
||||
// getM: function (control,data) { // 移动业务请求
|
||||
|
||||
|
||||
// data.action_type = control
|
||||
// return Api.request('GET', ApiPath.mobUrl ,data)
|
||||
// },
|
||||
@ -43,4 +42,4 @@ export default {
|
||||
$webPostTest: function (controller,data) { // webapi
|
||||
return Api.request('POST', ApiPath.testApiurl +controller ,data||{},true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user