productDev/jinkuai.git

			@@ -210,7 +210,7 @@
			request.setOutTradeNo(orders.getOutTradeNo());
			request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//这个回调url必须是https开头的
			Amount amount = new Amount();
			amount.setTotal(1);//orders.getPayAccount().intValue());
			amount.setTotal(orders.getPayAccount().intValue());
			request.setAmount(amount);
			// PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
			// 跟之前下单示例一样，填充预下单参数

			@@ -32,6 +32,11 @@
			}
			})
			}
			uni.showShareMenu({
			withShareTicket: true,
			menus: ['shareAppMessage', 'shareTimeline']
			})

			},
			onShow: function() {
			console.log('App Show')

			@@ -19,7 +19,8 @@

			// Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/'
			Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'

			import shareMixin from '@/utils/shareMixin'
			Vue.mixin(shareMixin)
			const app = new Vue({
			store,
			...App

			@@ -14,7 +14,7 @@
			</view>
			<view class="info-box-head-info" v-if="isLogin">
			<view class="info-box-head-info-name" @click="jump(1)">{{userInfo.nickName\|\|'匿名'}}</view>
			<view class="info-box-head-info-type">
			<view class="info-box-head-info-type" >
			<view class="info-box-head-info-type-val1" v-if="userInfo.useIdentity==1">用工接单方</view>
			<view class="info-box-head-info-type-val" v-else>用工发布方</view>
			<!-- <view class="info-box-head-info-type-wz" @click="editUseIdentity">切换</view> -->
			@@ -153,7 +153,8 @@
			changing1:false,
			autoReceiveStatus: false,
			isLogin:false,
			useIdentity:0
			useIdentity:0,
			qrcode:''
			}
			},
			onShow(options){
			@@ -279,6 +280,20 @@
			that.changing1 = false
			})
			} ,
			saoyisao(){
			var that =this
			// 允许从相机和相册扫码
			wx.scanCode({
			// scanType:['barCode'],
			success (res) {
			that.qrcode =res.result
			console.log(res)
			},
			fail(e){
			console.error(e)
			}
			})
			},
			updateMemberInfo(e) {
			if(this.changing){
			return

	server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	small-program/App.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	small-program/main.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	small-program/pages/mine/mine.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史