ylj/wechat_yxcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2023-07-31 14:44:45 +08:00
parent 3f9b827c89
commit 7a04d86b0c
9 changed files with 167 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pages/authorityApproval/components/cancelView.vue
View File

@ -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) {

7
pages/authorityApproval/detail.vue
View File

@ -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()
}
}

9
pages/authorityApproval/index.vue
View File

@ -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,6 +109,11 @@
name:'资料完善',
src: '../../../../../static/images/expense/type/fksp.png',
typeId: 8
},
{
name:'账期作废',
src: '../../../../../static/images/expense/type/gcjsd.png',
typeId: 9
}
],

24
pages/dataSummary/dayDetail.vue
View File

@ -17,20 +17,24 @@
<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">
<!-- :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>{{sMsg.ENDACCOUNT_DATE}} <text class="uni-icon uni-icon-arrowdown"></text></view>
<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">
<div class="box-center-box">
<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">{{sMsg.CASHPAY ? $util.fmoney(sMsg.CASHPAY,2) : '0.00'}}</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">
<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>
@ -45,8 +49,8 @@
</view>
</div>
<div class="box-bottom-tab">
<div class="tab-unit" style="flex: 3;">
<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>
@ -62,7 +66,9 @@
<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">

14
pages/dataSummary/detail.vue
View File

@ -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: '正在提交...',

2
pages/index/index.vue
View File

@ -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',

5
pages/register/register.vue
View File

@ -86,9 +86,10 @@
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

6
util/api.js
View File

@ -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,10 +31,10 @@ 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){
if (Store.state.userData.AuthorityInfo['1d46081b-6ff8-44d5-9205-31c72bdb4328']===1){
str ='1d46081b-6ff8-44d5-9205-31c72bdb4328'
}
@ -53,6 +52,7 @@ export default {
str +=',27109d64-63f9-4bb9-ab90-4c2c92296c73'
}
}
}
if (str===''){
str = 0
}
@ -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("服务器错误，请稍后重试");
}

1
util/index.js
View File

@ -7,7 +7,6 @@ export default {
return Api.request('POST', ApiPath.baseURL ,data)
},
get: function (data) { // 合作商户请求
return Api.request('GET', ApiPath.baseURL ,data)
},
// postM: function (control,data) { // 移动业务请求