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

1.对接桌码

Browse Source 
2.对接消息通知
3.对接扫码分配二维码
huipay-app-dev
杨杰 1 year ago
parent 704f9ec888
commit 0b7da8dfcf
9 changed files with 523 additions and 497 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. 3
      App.vue
  2. 21
      Utils/Api.js
  3. 106
      components/downloadUp.vue
  4. 4
      manifest.json
  5. 16
      pages/index/bindScan/bindScan.vue
  6. 18
      pages/index/merchant-details/merchant-details.vue
  7. 24
      pages/index/salesOrderList/salesOrderList.vue
  8. 18
      pages/index/scanCodeAllocation/scanCodeAllocation.vue
  9. 6
      pages/tabBar/home/home.vue

3
App.vue
Unescape View File

@ -60,8 +60,7 @@
const res = uni.getSystemInfoSync(); const res = uni.getSystemInfoSync();
uni.setStorageSync('platform', res.platform); uni.setStorageSync('platform', res.platform);
plus.runtime.getProperty(plus.runtime.appid, function(inf) { plus.runtime.getProperty(plus.runtime.appid, function(inf) {
uni.setStorageSync('version', inf.version); // 大版本号 uni.setStorageSync('version', inf.versionCode);
uni.setStorageSync('versionCode', inf.versionCode); // 小版本号
}); });
let uuid = plus.device.uuid; let uuid = plus.device.uuid;

21
Utils/Api.js
Unescape View File

@ -177,18 +177,6 @@ export const deviceRefund = params => {
// //门店添加设备
// export const bindStoreDevice = params => {
// return POST('POST', `${base}/device/bindStoreDevice`, params).then(res => res.data);
// }
// //业务员查询设备列表
// export const getSalesmanDeviceList = params => {
// return POST('GET', `${base}/device/getSalesmanDeviceList`, params).then(res => res.data);
// }
// //门店查询设备列表
// export const getStoreDeviceList = params => {
// return POST('GET', `${base}/device/getStoreDeviceList`, params).then(res => res.data);
// }
//业务员查询统计 //业务员查询统计
export const moveHomeCount = params => { export const moveHomeCount = params => {
@ -282,7 +270,16 @@ export const uniPush = params => {
export const connectStoreCid = params => { export const connectStoreCid = params => {
return POST('POST', `${base}/storeCid/connectStoreCid`, params).then(res => res.data); return POST('POST', `${base}/storeCid/connectStoreCid`, params).then(res => res.data);
} }
//解除绑定
export const unbindStore = params => {
return POST('POST', `${base}/payQrCode/unbindStore`, params).then(res => res.data);
}
//结束播报语音 //结束播报语音
export const voiceSucceed = params => { export const voiceSucceed = params => {
return POST('GET', `${base}/storeCid/voiceSucceed`, params).then(res => res.data); return POST('GET', `${base}/storeCid/voiceSucceed`, params).then(res => res.data);
} }
//查询版本号?termType=APP
export const queryVersion = params => {
return POST('GET', `${base}/sysVersion/queryVersion`, params).then(res => res.data);
}

106
components/downloadUp.vue
Unescape View File

@ -2,20 +2,23 @@
<view class="content" v-if="bannerShow"> <view class="content" v-if="bannerShow">
<!-- 弹出层 --> <!-- 弹出层 -->
<view class="uni-banner"> <view class="uni-banner">
<image src="/static/img/startUpHeader01.png" class="startUpHeaderLogo" /> <!-- <image src="../static/logo.png" class="startUpHeaderLogo" /> -->
<view class="banner_box"> <view class="banner_box">
<view class="startUpHeaderBox h6">发现新版本</view> <view class="startUpHeaderBox h6">发现新版本</view>
<view class="conter">{{ msg }}</view> <view class="conter">{{ msg }}</view>
<view class="banner_foot"><button @click="goUpdate(updateApkObj)" class="banner_foot_button">前往升级</button></view> <view class="banner_foot"><button @click="goUpdate()" class="banner_foot_button">前往升级</button></view>
</view> </view>
</view> </view>
<view class="uni-mask"></view> <view class="uni-mask"></view>
</view> </view>
</template> </template>
<script> <script>
import { comparisonVersionHandler } from '@/common/js/tools'; // import {
import { getUpgrade } from '@/common/js/apis'; // getUpgrade
// } from '@/common/js/apis';
import {
queryVersion
} from '../Utils/Api.js'
export default { export default {
data() { data() {
return { return {
@ -28,42 +31,36 @@ export default {
created() { created() {
const appUpdate = uni.getStorageSync('platform'); const appUpdate = uni.getStorageSync('platform');
// #ifdef APP-PLUS // #ifdef APP-PLUS
this.type = appUpdate == 'android' ? 2 : 1;
this.checkUpdate(); this.checkUpdate();
// #endif // #endif
}, },
methods: { methods: {
checkUpdate() { checkUpdate() {
const self = this, let that = this;
localAppVersonName = uni.getStorageSync('version'), let localAppVersonName = uni.getStorageSync('version');
localAppVerson = uni.getStorageSync('versionCode');
// #ifdef APP-PLUS // #ifdef APP-PLUS
plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) { let datas = {
getUpgrade({ termType: "app"
appType: self.type }
}).then(res => { queryVersion(datas).then(res => {
const { data } = res.data; if (res.return_code == '000000') {
if (res.data.code !== '200') return; if (res.return_data.versionType == 1 && that.comparisonVersionHandler(localAppVersonName,
// 大版本更新 res.return_data.version)) {
if (data.apkVersion && comparisonVersionHandler(localAppVersonName, data.apkVersion.appVersonName)) { that.downloadWgt(res.return_data.fileUrl);
uni.hideTabBar()
self.updateApkObj = data.apkVersion;
self.msg = data.apkVersion.versonLog;
self.bannerShow = true;
return;
// app热更新
} else if (data.wgtVersion && comparisonVersionHandler(localAppVerson, data.wgtVersion.appVerson)) {
self.downloadWgt(data.wgtVersion.downloadUrl);
return; return;
} else { }
if (res.return_data.versionType == 2 && that.comparisonVersionHandler(localAppVersonName,
res.return_data.version)) {
that.updateApkObj = res.return_data;
that.bannerShow = true; // 显示弹窗
return; return;
} }
}); }
}); })
// #endif // #endif
}, },
downloadWgt(updateWgtUrl) { downloadWgt(updateWgtUrl) {
// 热更新 // 热更新
// 下载wgt方法 // 下载wgt方法
@ -72,8 +69,7 @@ export default {
plus.nativeUI.showWaiting('正在更新...'); plus.nativeUI.showWaiting('正在更新...');
plus.downloader plus.downloader
.createDownload( .createDownload(
updateWgtUrl, updateWgtUrl, {
{
filename: '_doc/update/' filename: '_doc/update/'
}, },
function(d, status) { function(d, status) {
@ -89,8 +85,9 @@ export default {
// 安装wgt方法 // 安装wgt方法
plus.nativeUI.showWaiting('安装文件...'); plus.nativeUI.showWaiting('安装文件...');
plus.runtime.install( plus.runtime.install(
path, path, {
{ force: true }, force: true
},
function() { function() {
plus.nativeUI.closeWaiting(); plus.nativeUI.closeWaiting();
plus.nativeUI.alert('应用资源更新完成！', function() { plus.nativeUI.alert('应用资源更新完成！', function() {
@ -102,14 +99,17 @@ export default {
} }
); );
}, },
goUpdate(updateApkObj) { goUpdate() {
if (this.type == 2) { if (this.type == 2) {
// 弹出系统等待对话框 // 弹出系统等待对话框
var dtask = plus.downloader.createDownload(updateApkObj.downloadUrl, {}, function(d, status) { var dtask = plus.downloader.createDownload(
this.updateApkObj.fileUrl, {},
function(d, status) {
this.bannerShow = false; this.bannerShow = false;
// 下载完成 // 下载完成
if (status == 200) { if (status == 200) {
plus.runtime.install(plus.io.convertLocalFileSystemURL(d.filename), {}, {}, function(error) { plus.runtime.install(plus.io.convertLocalFileSystemURL(d.filename), {}, {}, function(
error) {
uni.showToast({ uni.showToast({
title: '安装失败', title: '安装失败',
mask: false, mask: false,
@ -138,7 +138,8 @@ export default {
showLoading.setTitle('已连接到服务器'); showLoading.setTitle('已连接到服务器');
break; break;
case 3: case 3:
prg = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100); prg = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) *
100);
showLoading.setTitle(' 正在下载' + prg + '% '); showLoading.setTitle(' 正在下载' + prg + '% ');
break; break;
case 4: case 4:
@ -158,6 +159,35 @@ export default {
} else if (this.type == 1) { // ios跳转到app store } else if (this.type == 1) { // ios跳转到app store
plus.runtime.openURL(updateApkObj.downloadUrl); plus.runtime.openURL(updateApkObj.downloadUrl);
} }
},
//判断是否升级
comparisonVersionHandler(reqV, curV) {
/* 版本号名比较是否需要升级
curV string :当前最新
reqV string :之前
返回 true 表示需要升级
*/
if (curV && reqV) {
curV = String(curV);
reqV = String(reqV);
//将两个版本号拆成数字
let arr1 = curV.split('.'), //當前
arr2 = reqV.split('.');
let minLength = Math.min(arr1.length, arr2.length),
position = 0,
diff = 0;
//依次比较版本号每一位大小，当对比得出结果后跳出循环
while (position < minLength && ((diff = parseInt(arr1[position]) - parseInt(arr2[position])) == 0)) {
position++;
}
diff = (diff != 0) ? diff : (arr1.length - arr2.length);
//若curV大于reqV，则返回true
return diff > 0;
} else {
//输入为空
return false;
}
} }
} }
}; };
@ -240,7 +270,7 @@ export default {
.startUpHeaderBox { .startUpHeaderBox {
width: 100%; width: 100%;
height: 96rpx; height: 96rpx;
background-image: url('/static/img/startUpHeader02.png'); background-image: url('/static/logo.png');
background-position: left top; background-position: left top;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;

4
manifest.json
Unescape View File

@ -3,7 +3,7 @@
"appid": "__UNI__190622D", "appid": "__UNI__190622D",
"description": "", "description": "",
"versionName": "1.0.0", "versionName": "1.0.0",
"versionCode" : "100", "versionCode": 101,
"transformPx": false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus": {
@ -128,6 +128,6 @@
"key": "7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB" "key": "7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB"
} }
} }
} },
} }
} }

16
pages/index/bindScan/bindScan.vue
Unescape View File

@ -17,16 +17,16 @@
<view class="mart10 fcor666 padleft15 font14" v-else>创建: {{item.createTime | timeFormat('yyyy-mm-dd')}} <view class="mart10 fcor666 padleft15 font14" v-else>创建: {{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}} {{item.createTime | timeFormat('hh:mm')}}
</view> </view>
<button class="btns" @click="bindStore(item.id)" v-if="typeId == 1">绑定二维码</button> <button class="btns" @click="unbindStore(item.id)">解除绑定</button>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { import {
bindStore,
getSalesmanQrCodeList, getSalesmanQrCodeList,
getStoreQrCodeList getStoreQrCodeList,
unbindStore
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
let app = getApp(); let app = getApp();
export default { export default {
@ -135,12 +135,12 @@
} }
}); });
}, },
//绑定设备 //解除绑定设备
bindStore(item) { unbindStore(item) {
let that = this; let that = this;
uni.showModal({ uni.showModal({
title: '绑定二维码', title: '解绑二维码',
content: '是否绑定当前二维码。', content: '是否解绑当前二维码。',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
uni.showLoading({ uni.showLoading({
@ -150,7 +150,7 @@
"qrCodeId": item, "qrCodeId": item,
"storeId": that.storeId "storeId": that.storeId
} }
bindStore(params).then(res => { unbindStore(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.showToast({ uni.showToast({

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

@ -90,7 +90,7 @@
<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view> <view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
</view> </view>
<view class="height45 width100"> <view class="height45 width100">
<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button> <button class="btns mart10 margle10" @click.stop="jumpBindScan(item,1)">绑定二维码</button>
<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button> <button class="btns mart10 margle10" @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,1)">绑定设备</button> -->
<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> --> <!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> -->
@ -199,10 +199,26 @@
}, },
//跳转绑定二维码 //跳转绑定二维码
jumpBindScan(item, items) { jumpBindScan(item, items) {
if (items == 1) {
// 允许从相机和相册扫码
uni.scanCode({
success: function(res) {
let scanCont = res.result.split('=');
let scanNo = scanCont[1];
uni.navigateTo({
url: '/pages/index/scanCodeAllocation/scanCodeAllocation?storename=' +
item.name + '&scanno=' + scanNo +
'&storeId=' + item.id
})
}
});
} else {
uni.navigateTo({ uni.navigateTo({
url: '../bindScan/bindScan?storeid=' + item + '&type=' + items url: '../bindScan/bindScan?storeid=' + item + '&type=' + items
}) })
} }
}
} }
} }
</script> </script>

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

@ -29,17 +29,12 @@
<view class="margle10 font13 fcor999">申请数量: 1台</view> <view class="margle10 font13 fcor999">申请数量: 1台</view>
</view> </view>
<view class="width90 paddbotm10 alijusstart"> <view class="width90 paddbotm10 alijusstart">
<view class="otstatucs border-r marRight10" @click.stop="scanNo(item)"
v-if="item.status == 2 && item.deviceType == 2">
分配桌码
</view>
<view class="otstatucs border-r marRight10" @click.stop="orderRefund(item.orderNo)" <view class="otstatucs border-r marRight10" @click.stop="orderRefund(item.orderNo)"
v-if="item.status == 2 && item.deviceType == 1"> v-if="item.status == 2">
订单退款 订单退款
</view> </view>
<view class="otstatucs border-r marRight10" @click.stop="replace(item.orderAssignList[0].id)" <view class="otstatucs border-r marRight10" @click.stop="replace(item.orderAssignList[0].id)"
v-if="item.status == 3 && item.deviceType == 1"> v-if="item.status == 3">
更换设备 更换设备
</view> </view>
</view> </view>
@ -134,21 +129,6 @@
} }
}) })
}, },
//扫码分配
scanNo(item) {
// 允许从相机和相册扫码
uni.scanCode({
success: function(res) {
let scanCont = res.result.split('=');
let scanNo = scanCont[1];
uni.navigateTo({
url: '/pages/index/scanCodeAllocation/scanCodeAllocation?storename=' +
item.storeName + '&scanno=' + scanNo + '&orderno=' + item.orderNo
})
}
});
},
//分配设备 //分配设备
jumpService(item) { jumpService(item) {
if (this.goodtyid == 2) { if (this.goodtyid == 2) {

18
pages/index/scanCodeAllocation/scanCodeAllocation.vue
Unescape View File

@ -11,30 +11,30 @@
<view class="font14 fcor333 text2 width75 fotrt">{{scanNo}}</view> <view class="font14 fcor333 text2 width75 fotrt">{{scanNo}}</view>
</view> </view>
<view class="btn" @tap="assignOrder">提交绑定</view> <view class="btn" @tap="bindStore">提交绑定</view>
</view> </view>
</template> </template>
<script> <script>
import { import {
assignOrder bindStore
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
export default { export default {
data() { data() {
return { return {
scanNo: '', //扫码编号, scanNo: '', //扫码编号,
storeName: '', //门店名称 storeName: '', //门店名称
orderNo: '' //订单编号 storeId: '' //订单编号
} }
}, },
onLoad(options) { onLoad(options) {
this.scanNo = options.scanno; this.scanNo = options.scanno;
this.storeName = options.storename; this.storeName = options.storename;
this.orderNo = options.orderno; this.storeId = options.storeId;
}, },
methods: { methods: {
//分配设备 //分配设备
assignOrder() { bindStore() {
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '是否分配当前设备', content: '是否分配当前设备',
@ -43,13 +43,11 @@
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}) })
let serviceList = [];
serviceList.push(this.scanNo);
let datas = { let datas = {
"orderNo": this.orderNo, "serialNumber": this.scanNo,
"deviceNoList": serviceList "storeId": this.storeId
} }
assignOrder(datas).then(res => { bindStore(datas).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.showToast({ uni.showToast({

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

@ -64,6 +64,8 @@
</view> </view>
</view> </view>
<view class="width100 height40p"></view> <view class="width100 height40p"></view>
<downloadup></downloadup>
</view> </view>
</template> </template>
@ -76,8 +78,12 @@
connectStoreCid, connectStoreCid,
voiceSucceed voiceSucceed
} from '../../../Utils/Api.js' } from '../../../Utils/Api.js'
import downloadup from '../../../components/downloadUp.vue'
let app = getApp(); let app = getApp();
export default { export default {
components: {
downloadup
},
data() { data() {
return { return {
funcList: [], funcList: [],

Write Preview
Loading…
Cancel
Save