yangjie
/
xuan-pay-cweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.设备管理修改问题

Browse Source
huipay-master
杨杰 2 years ago
parent fe16280d0c
commit d7ec5835ba
11 changed files with 136 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      Utils/Api.js
  2. 20
      pages.json
  3. 2
      pages/index/addService/addService.vue
  4. 24
      pages/index/doorManage/doorManage.vue
  5. 4
      pages/index/merchant-details/merchant-details.vue
  6. 2
      pages/index/merchant-management/merchant-management.vue
  7. 7
      pages/index/mineService/mineService.vue
  8. 56
      pages/index/serviceOrderDetails/serviceOrderDetails.vue
  9. 5
      pages/tabBar/home/home.vue
  10. 11
      pages/welcome/welcome.vue
  11. 2
      unpackage/dist/build/h5/index.html

4
Utils/Api.js
Unescape View File

@ -129,6 +129,10 @@ export const replace = params => {
export const orderRefund = params => {
return POST('POST', `${base}/deviceOrder/orderRefund`, params).then(res => res.data);
}
//订单分配退款
export const deviceRefund = params => {
return POST('POST', `${base}/deviceOrder/deviceRefund`, params).then(res => res.data);
}
// ----------------

20
pages.json
Unescape View File

@ -1,11 +1,11 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/login/login",
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "登录",
"onReachBottomDistance": 50,
"path" : "pages/welcome/welcome",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
@ -13,11 +13,11 @@
}
},{
"path" : "pages/welcome/welcome",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"path": "pages/login/login",
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "登录",
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"

2
pages/index/addService/addService.vue
Unescape View File

@ -164,7 +164,7 @@
title: '支付中...'
})
jweixin.config({
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
// debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: self.return_data.appId, // 必填，公众号的唯一标识
timestamp: self.return_data.timeStamp, // 必填，生成签名的时间戳
nonceStr: self.return_data.nonceStr, // 必填，生成签名的随机串

24
pages/index/doorManage/doorManage.vue
Unescape View File

@ -39,6 +39,11 @@
<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
</view>
<view class="height45 width100">
<button class="btns mart10 marRight10" @click.stop="jumpMineDevice(item.id)">查看设备</button>
</view>
<view class="width100 height10"></view>
</view>
<image src="../../../static/img/addser.png" mode="widthFix" class="xfimg" @click="jumpaddstore"></image>
</view>
@ -91,6 +96,12 @@
uni.navigateTo({
url: '../addStore/addStore'
})
},
//跳转设备列表
jumpMineDevice(item){
uni.navigateTo({
url:'/pages/index/mineService/mineService?id=5'+'&storeid='+item
})
}
}
}
@ -136,4 +147,17 @@
position: fixed;
right: 40rpx;
}
.btns {
width: 21%;
margin-left: 5%;
float: left;
height: 35px;
line-height: 35px;
background-color: #0083f5;
color: #FFFFFF;
font-weight: bold;
font-size: 12px;
padding: 0px;
}
</style>

4
pages/index/merchant-details/merchant-details.vue
Unescape View File

@ -74,12 +74,12 @@
<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
</view>
<view class="height45 width100">
<!-- <view class="height45 width100">
<button class="btns mart10 marRight10" @click.stop="jumpBindScan(item.id,1)">二维码列表</button>
<button class="btns mart10 marRight10" @click.stop="jumpBindScan(item.id,2)">绑定二维码</button>
<button class="btns mart10 marRight10" @click.stop="jumpService(item.id,1)">绑定设备</button>
<button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button>
</view>
</view> -->
<view class="lin10"></view>
</view>
</view>

2
pages/index/merchant-management/merchant-management.vue
Unescape View File

@ -14,7 +14,7 @@
@click="jumpmerdes(item.id)">
<view class="notes">
<image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image>
<view class="width65 margle">
<view class="width60 margle">
<view class="font14 fcor333">{{item.regPhone}}</view>
<view class="font12 fcor999">
{{item.createTime | timeFormat('yyyy-mm-dd')}}

7
pages/index/mineService/mineService.vue
Unescape View File

@ -48,6 +48,7 @@
buildStatus: false, //是否分配
deviceNo: '', // 设备编号
assderid: '', //分配id
storeid:'', //门店id
pageNum: 1,
pagesize: 10,
isLoadMore: false, //是否加载中
@ -75,8 +76,9 @@
onLoad(options) {
this.sourceId = options.id;
this.orderNo = options.orderNo;
this.storeid = options.storeid;
this.assderid = options.assderid;
if (this.sourceId == 1) {
if (this.sourceId == 1 || this.sourceId == 5) {
this.buildStatus = true;
this.getDeviceList();
}
@ -96,7 +98,8 @@
pageNum: this.pageNum,
pageSize: this.pagesize,
buildStatus: this.buildStatus,
deviceNo: this.deviceNo
deviceNo: this.deviceNo,
storeId: this.storeid
}
getDeviceList(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') {

56
pages/index/serviceOrderDetails/serviceOrderDetails.vue
Unescape View File

@ -59,19 +59,22 @@
{{ orderDetails.orderAssignList[0].orderType | toFilterDdevic()}}
</view>
</view>
</view>
<button class="btns marb40" @click="deviceRefund" v-if="userInfo.secUser.objectType == 5 && orderDetails.status == 3">申请退款</button>
</view>
</template>
<script>
import {
getOrderDetail
getOrderDetail,
deviceRefund
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
userInfo: app.globalData.userInfo, //登录信息
orderNo: '', // 订单号
orderDetails: '' // 订单详情
}
@ -120,6 +123,44 @@
this.orderDetails = res.return_data;
}
})
},
//设备申请退款
deviceRefund(){
let that = this;
uni.showModal({
title: '温馨提示',
content: '是否申请设备退款',
success: (res) => {
if (res.confirm) {
uni.showLoading({
title: '加载中'
})
let datas = {
"deviceOrderAssignId": that.orderDetails.orderAssignList[0].id
}
deviceRefund(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '退款成功',
icon: 'none',
success() {
setTimeout(() => {
that.getOrderDetail();
}, 2000);
}
})
} else {
uni.showToast({
title: res.return_msg,
duration: 5000,
icon: 'none'
})
}
})
} else if (res.cancel) {}
}
});
}
}
}
@ -137,4 +178,15 @@
padding: 30rpx 0 30rpx 20rpx;
border-bottom: 1px solid #f6f6f6;
}
.btns {
margin-top: 200rpx;
width: 80%;
margin-left: 10%;
height: 50px;
line-height: 50px;
background-color: #0083f5;
color: #FFFFFF;
font-weight: bold;
}
</style>

5
pages/tabBar/home/home.vue
Unescape View File

@ -45,7 +45,7 @@
</view>
</view>
<!-- 消息中心 -->
<view class="width100 backcorfff mart145" @click="jumpmescon">
<view class="width100 backcorfff " style="position: absolute;top: 300px;" @click="jumpmescon">
<view class="width94 alijusstart height50">
<image src="../../../static/img/mer6.png" mode="widthFix" class="iconw25 marglerig"></image>
<text class="width90p">消息中心</text>
@ -53,11 +53,12 @@
</view>
</view>
<!-- 菜单功能 -->
<view class="width100 line10"></view>
<view class="width100" style="position: absolute;top:360px;">
<view class="funcss" v-for="(item,index) in funcList" :key="index" @click="jumpdesfun(item)">
<image :src="item.img" mode="widthFix" class="funicon"></image>
<view class="width100 font14 mart5">{{item.title}}</view>
</view>
</view>
<view class="width100 height40p"></view>
</view>
</template>

11
pages/welcome/welcome.vue
Unescape View File

@ -12,7 +12,7 @@
export default {
data() {
return {
userInfo: app.globalData.userInfo, //登录信息
}
},
onLoad(options) {
@ -31,7 +31,7 @@
}
} else {
// 获取openid
// that.jumpcdx();
that.jumpcdx();
}
if (app.globalData.h5code) {
that.getAccessToken();
@ -51,9 +51,16 @@
key: "openId",
data: res.return_data.openid
})
if (this.userInfo) {
uni.reLaunch({
url: '../tabBar/home/home'
})
} else {
uni.reLaunch({
url: '/pages/login/login'
})
}
} else {
this.jumpcdx();
}

2
unpackage/dist/build/h5/index.html vendored
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>惠支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.e911c294.js></script><script src=/cweb/static/js/index.ffd9f4df.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.e911c294.js></script><script src=/cweb/static/js/index.8334b05a.js></script></body></html>
Write Preview
Loading…
Cancel
Save