修改

assets/http/api.js

@@ -11,6 +11,7 @@ const wxApp={
 //字典
 const dict={
 	list:p => http.get('/blade-system/dict-biz/dictionary', {params:p}),
+	dictionaryPage:p => http.get('/blade-system/dict-biz/dictionaryPage', {params:p}),
 }
 
 
@@ -160,7 +161,7 @@ const address={
 
 
 const userChannelPoint={
-	list:p => http.get('ldt_user/userchannelpoint/list',{params:p}),
+	list:p => http.get('common/userchannelpoint/list',{params:p}),
 }
 const order={
 	list:p => http.get("ldt_bills/goodsbills/list", {params:p}),

assets/http/global.js

@@ -1,11 +1,11 @@
 let global = {}
 
 
-// global.baseUrl = 'https://ldt.guosen-fumao.cn/api/'
-// global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
+global.baseUrl = 'https://ldt.guosen-fumao.cn/api/'
+global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
 
-global.baseUrl = 'http://192.168.1.168:2366/'
-global.WebSocketUrl = 'ws://192.168.1.168:2366/websocket/'
+// global.baseUrl = 'http://192.168.1.168:2366/'
+// global.WebSocketUrl = 'ws://192.168.1.168:2366/websocket/'
 
 global.tokenUrl = global.baseUrl +
 	'blade-auth/oauth/token?tenantId=000000&password=21232f297a57a5a743894a0e4a801fc3&username=admin'

components/login.vue

@@ -129,10 +129,10 @@
 					if (resp.success) {
 						//登录成功
 						let obj = {
+							...resp.data,
 							openId,
 							sessionKey: this.sessionKey,
 							userId: resp.data.id,
-							phone: resp.data.phone
 						}
 						//将openid和sessionkey存进缓存中,有效时间为七天
 						this.$cache.put("userInfo", obj)

components/my-bills.vue

@@ -12,8 +12,8 @@
 			</view>
 		</view>
 		<view @click="$jump('/pagesA/pages/bill/my-bills')" class="wallet-item u-flex-col wallet-right u-col-center">
-			<image class="cut-off--line" src="http://file.shopro.top/imgs/user/cut_off_line.png" mode=""></image>
-			<image class="wallet-img" src="https://guosen-bucket-ldt.obs.cn-south-1.myhuaweicloud.com:443/33456520560a489c97001067ebf933fb-1WVTKPv7pPRY56bd16f50ac21bf860f78d0335131292.png" mode="aspectFill"></image>
+			<image class="cut-off--line" src="../static/icon/line.png" mode=""></image>
+			<image class="wallet-img" src="../static/icon/mybills1.png" mode="aspectFill"></image>
 			<text class="wallet-item__title">我的账单</text>
 		</view>
 	</view>
@@ -67,8 +67,7 @@ export default {
 		}
 		.wallet-item__title {
 			font-size: 26rpx;
-			font-weight: 400;
-			color: rgba(138, 138, 138, 1.0);
+			color: #242424;
 			margin-top: 20rpx;
 		}
 		.item-balance::after {

pages/consume/comps/card1.vue

@@ -19,7 +19,7 @@
 						<view class="text-cut-1" style="width: 70%;">
 							<text class="">{{item.name}}</text>
 						</view>
-						<view @click.stop="$jump(`/pagesD/pages/menu/menu?shopId=${item.id}`)" class="text-base center" style="font-size: 28rpx;font-weight: normal;text-decoration: underline;">
+						<view @click.stop="$jump(`/pagesD/pages/menu/menu?shopId=${item.id}`)" class="text-base center" style="font-size: 28rpx;font-weight: normal;">
 							<image class="" style="width: 36rpx;height: 36rpx;margin-right: 4rpx;" src="@/static/icon/order.png" mode=""></image>
 							<text>去点餐</text>
 						</view>

pagesA/pages/bill/bill-detail.vue

@@ -5,14 +5,17 @@
 				<image style="border-radius: 50%;" :src="item.channelLogo" mode=""></image>
 				<text class="title">{{item.channelName}}</text>
 				<view class="data text-center center">
-					<view style="padding: 0;">
+					<view v-if="item.type=='PAY_CONSUMER'" style="padding: 0;">
 						<text>-</text>
 						<text>{{item.totalPrice}}</text>
 					</view>
+					<view v-else style="padding: 0;">
+						<text>+</text>
+						<text>{{item.price}}</text>
+					</view>
 				</view>
 			</view>
 			<view class="card">
-				
 				<block v-if="item.type!=4">
 					<view class="item">
 						<text>交易状态</text>
@@ -46,9 +49,13 @@
 				<image  style="border-radius: 50%;"  :src="item.logo" mode=""></image>
 				<text class="title">{{item.name}}</text>
 				<view class="data text-center center">
-					<view style="padding: 0;">
-						<text>-</text>
-						<text>{{item.totalPrice}}</text>
+					<view v-if="item.type=='PAY_CONSUMER'" >
+						<text style="padding: 0;color: #F39248;">-</text>
+						<text style="padding: 0;color: #F39248;">{{item.totalPrice}}</text>
+					</view>
+					<view v-else style="padding: 0;">
+						<text>+</text>
+						<text>{{item.price}}</text>
 					</view>
 				</view>
 			</view>
@@ -65,13 +72,14 @@
 					<text>交易金额</text>
 					<text>{{item.price}}</text>
 				</view>
-				<view class="item">
+				<view class="item" v-if="item.type=='PAY_CONSUMER'">
 					<text>积分手续费</text>
 					<text>{{item.fee}}</text>
 				</view>
 				<view class="item">
-					<text>支付方式</text>
-					<text>余额支付</text>
+					<text>交易类型</text>
+					<text v-if="item.type=='PAY_CONSUMER'">用户消费</text>
+					<text v-else>赠送积分</text>
 				</view>
 				<view class="item">
 					<text>交易时间</text>
@@ -86,12 +94,23 @@
 		
 		<block v-if="type=='all'">
 			<view class="top">
-				<image  style="border-radius: 50%;"  :src="item.receiverLogo" mode=""></image>
-				<text class="title">{{item.receiverName}}</text>
+				<block v-if="item.type=='AGENT_CHARGE'">
+					<image  style="border-radius: 50%;" src="../../../static/logo.png" mode=""></image>
+					<text class="title">联兑通</text>
+				</block>
+				<block v-else>
+					<image  style="border-radius: 50%;"  :src="item.receiverLogo" mode=""></image>
+					<text class="title">{{item.receiverName}}</text>
+				</block>
+				
 				<view class="data text-center center">
-					<view style="padding: 0;">
-						<text>-</text>
-						<text>{{item.totalPrice}}</text>
+					<view style="padding: 0;" v-if="item.type=='AGENT_CHARGE'">
+						<text style="color: #F39248;">-</text>
+						<text style="color: #F39248;">{{item.price}}</text>
+					</view>
+					<view style="padding: 0;" v-else>
+						<text style="color: #F39248;">-</text>
+						<text style="color: #F39248;">{{item.totalPrice}}</text>
 					</view>
 				</view>
 			</view>
@@ -104,7 +123,7 @@
 					<text>交易状态</text>
 					<text>{{item.payStatus}}</text>
 				</view>
-				<view class="item">
+				<view class="item" v-if="$isNotEmpty(item.pointNum) && item.pointNum != -1">
 					<text>积分支付</text>
 					<text>{{item.pointNum}}</text>
 				</view>
@@ -117,11 +136,11 @@
 					<text>现金支付</text>
 					<text>{{item.price}}</text>
 				</view>
-				<view class="item">
+				<view class="item" v-if="$isNotEmpty(item.pointFee) && item.pointFee != -1">
 					<text>积分手续费</text>
 					<text>{{item.pointFee}}</text>
 				</view>
-				<view class="item">
+				<view class="item" v-if="$isNotEmpty(item.fee) && item.fee != -1">
 					<text>交易手续费</text>
 					<text>{{item.fee}}</text>
 				</view>

pagesA/pages/bill/my-bills.vue

@@ -29,7 +29,14 @@
 				<view @click="$jump('/pagesA/pages/bill/bill-detail?billDetail='+JSON.stringify(item)+'&type=all')" class="item" hover-class="hoverClass"
 					v-for="(item,index) in list" :key="index">
 					<view class="area1">
-						<view class="item-padding">
+						<view class="item-padding" v-if="item.type=='AGENT_CHARGE'">
+							<image  src="../../../static/logo.png" style="border-radius: 50%;" mode="aspectFit"></image>
+							<view class="">
+								<text>联兑通</text>
+								<text>{{item.createTime}}</text>
+							</view>
+						</view>
+						<view class="item-padding" v-else>
 							<image  :src="item.receiverLogo" style="border-radius: 50%;" mode="aspectFit"></image>
 							<view class="">
 								<text>{{item.receiverName}}</text>
@@ -38,7 +45,10 @@
 						</view>
 					</view>
 					<view  class="area3 text-area u-flex-1" >
-						<view class="item-padding" style="text-align: right;flex:1;font-size: 34rpx;color: #F39248;margin-right: 20rpx;">-￥{{item.totalPrice}}</view>
+						<view class="item-padding" style="text-align: right;flex:1;font-size: 34rpx;margin-right: 20rpx;">
+							<text v-if="item.type=='USER_PAY'" style="color: #F39248;">-￥{{item.totalPrice}}</text>
+							<text v-if="item.type=='AGENT_CHARGE'" style="color: #F39248;">-￥{{item.price}}</text>
+						</view>
 					</view>
 				</view>
 			</mescroll-body>

pagesA/pages/my-balance/my-balance.vue

@@ -30,15 +30,18 @@
 					v-for="(item,index) in list" :key="index">
 					<view class="area1">
 						<view class="item-padding">
-							<image  :src="item.logo" style="border-radius: 50%;" mode="aspectFit"></image>
+							<image  :src="item.logo?item.logo:'../../static/icon/shop_default.png'" style="border-radius: 50%;" mode="aspectFit"></image>
 							<view class="">
-								<text>{{item.name}}</text>
+								<text>{{item.name || '暂无名称'}}</text>
 								<text>{{item.updateTime}}</text>
 							</view>
 						</view>
 					</view>
 					<view  class="area3 text-area u-flex-1" >
-						<view class="item-padding" style="text-align: right;flex:1;font-size: 34rpx;color: #F39248;margin-right: 20rpx;">-￥{{item.totalPrice}}</view>
+						<view class="item-padding" style="text-align: right;flex:1;font-size: 34rpx;margin-right: 20rpx;">
+							<text style="color: #F39248;;" v-if="item.type=='PAY_CONSUMER'">-￥{{item.totalPrice}}</text>
+							<text  v-else>+￥{{item.price}}</text>
+						</view>
 					</view>
 				</view>
 			</mescroll-body>
@@ -89,7 +92,7 @@
 					current:mescroll.num,
 					size:mescroll.size,
 					payId:this.vuex_userId,
-					payStatus:'付款成功'
+					receiveId:this.vuex_userId,
 				}
 				if (this.defaultTime) {
 					params.createTime = this.$dateTime.format(new Date(this.defaultTime))

pagesA/pages/my-points/my-points.vue

@@ -52,7 +52,7 @@
 					</view>
 					<view class="area3 text-area ">
 						<view v-if="item.type=='PAY_CONSUMER'" class="item-padding" style="font-size: 34rpx;color: #000;">-￥{{item.totalPrice}}</view>
-						<view v-else class="item-padding" style="font-size: 34rpx;color: #000;">+￥{{item.totalPrice}}</view>
+						<view v-else class="item-padding" style="font-size: 34rpx;color: #000;">+￥{{item.price}}</view>
 					</view>
 				</view>
 			</mescroll-body>

pagesB/pages/agent/agent.vue

@@ -143,17 +143,25 @@
 			},
 			//字典 begin
 			async getBankType() {
-				let res = await this.$api.dict({code: 'bank_type'})
-				res.data.forEach(item=>{
+				let params={
+					code: 'bank_type',
+					size:9
+				}
+				let res = await this.$api.dict.dictionaryPage(params)
+				let list = res.data.records
+				list.shift()
+				list.forEach(item=>{
 					let obj={
-						label:item.dictValue,
+						label:JSON.parse(item.dictValue).name,
 						value:item.dictKey
 					}
 					this.bankTypeList.push(obj)
 				})
+				this.bankModel.bankTypeLabel=this.bankTypeList[0].label
+				this.bankModel.bankType=this.bankTypeList[0].value
 			},
 			async getBankAccountType() {
-				let res = await this.$api.dict({code: 'bank_account_type'})
+				let res = await this.$api.dict.list({code: 'bank_account_type'})
 				res.data.forEach(item=>{
 					let obj={
 						label:item.dictValue,
@@ -161,6 +169,8 @@
 					}
 					this.bankAccountTypeList.push(obj)
 				})
+				this.bankModel.bankAccountType=this.bankAccountTypeList[0].value
+				this.bankModel.bankAccountTypeLabel=this.bankAccountTypeList[0].label
 			},
 			//字典 end
 			bankTypeConfirm(e){
@@ -196,7 +206,7 @@
 					this.$u.toast('请输入银行卡号')
 					return
 				}
-				if (JSON.stringify(this.model)!=JSON.stringify(this.originalModel) &&
+				if (JSON.stringify(this.model)!=JSON.stringify(this.originalModel) ||
 					JSON.stringify(this.bankModel)!=JSON.stringify(this.originalBankModel)) {
 					//修改过，提交再跳转
 					this.$api.userBank.submit(this.bankModel)

pagesB/pages/userBank/add.vue

@@ -92,14 +92,22 @@
 			},
 			//字典 begin
 			async getBankType() {
-				let res = await this.$api.dict.list({code: 'bank_type'})
-				res.data.forEach(item=>{
+				let params={
+					code: 'bank_type',
+					size:9
+				}
+				let res = await this.$api.dict.dictionaryPage(params)
+				let list = res.data.records
+				list.shift()
+				list.forEach(item=>{
 					let obj={
-						label:item.dictValue,
+						label:JSON.parse(item.dictValue).name,
 						value:item.dictKey
 					}
 					this.bankTypeList.push(obj)
 				})
+				this.bankModel.bankTypeLabel=this.bankTypeList[0].label
+				this.bankModel.bankType=this.bankTypeList[0].value
 			},
 			async getBankAccountType() {
 				let res = await this.$api.dict.list({code: 'bank_account_type'})
@@ -109,9 +117,9 @@
 						value:item.dictKey
 					}
 					this.bankAccountTypeList.push(obj)
-					this.bankModel.bankAccountType=this.bankAccountTypeList[0].value
-					this.bankModel.bankAccountTypeLabel=this.bankAccountTypeList[0].label
 				})
+				this.bankModel.bankAccountType=this.bankAccountTypeList[0].value
+				this.bankModel.bankAccountTypeLabel=this.bankAccountTypeList[0].label
 			},
 			//字典 end
 			bankTypeConfirm(e){

pagesC/pages/checkstand/index.vue

@@ -21,7 +21,11 @@
 					</view>
 				</view>
 			</view>
+			<view class="text-center text-base padding-top-20">
+				<text>*使用联兑通付款会有优惠打折</text>
+			</view>
 		</view>
+		
 		<view style="margin-top: -20rpx;">
 			<channel-list ></channel-list>
 		</view>
@@ -219,7 +223,7 @@
 				let params = {
 					userId: this.vuex_userId,
 					appId: this.$global.wxParams.APPID,
-					billsTitle: '用户支付',
+					billsTitle: '用户扫码支付',
 					money: this.orderAmount,
 					expireTime,
 					shopId: this.shopId,
@@ -231,6 +235,8 @@
 				
 				let resp = await this.$api.pay.getPayOrderPamams(params)
 				this.payParams = resp.data
+				
+				
 				if (resp.data.status == '付款成功') {
 					this.handelResult(true)
 				} else if (resp.data.status == '待付款') {