Merge branch 'ldt' of http://192.168.1.218:3000/hmp/guosen-ldt-client into ldt

assets/http/global.js

@@ -1,63 +1,92 @@
 let global = {}
 
-// 	global.baseUrl='http://192.168.1.244:1888/api/'
-global.baseUrl='https://ldt.guosen-fumao.cn/api/'
 
-// global.baseUrl='http://localhost:2539/'
+const application='prod'	
+// const application='dev'
+// const application='test'
+
+if (application == 'prod') {
+	//正式环境
+	global.baseUrl = 'https://ldt.guosen-fumao.cn/api/'
+	global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
+	global.enabledCrypto = true //是否开启api加密
+	global.enabledDebug=false //是否开启调试模式
+}else if (application == 'dev') {
+	//开发环境
+	global.baseUrl = 'http://192.168.1.168:2366/'
+	global.WebSocketUrl = 'ws://192.168.1.168:2366/websocket/'
+	global.enabledCrypto = true
+	global.enabledDebug= true
+}else if (application == 'test') {
+	//测试环境
+	global.baseUrl = 'http://139.159.240.119:2366/'
+	global.WebSocketUrl = 'ws://139.159.240.119:2366/websocket/'
+	global.enabledCrypto = true
+	global.enabledDebug= true
+}
+
+
+global.tokenUrl = global.baseUrl +
+	'blade-auth/oauth/token?tenantId=000000&password=21232f297a57a5a743894a0e4a801fc3&username=admin'
 
-global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
+global.socket_prefix = 'USER:'
 
-global.tokenUrl=global.baseUrl+ '/blade-auth/oauth/token?tenantId=000000&username=admin&password=21232f297a57a5a743894a0e4a801fc3&grant_type=password&scope=all&type=account'
+global.socket_prefix_SHOP = 'SHOP:'
 
-global.agenterTypeId='1423464045809364994'
+global.cart_prefix = 'cart:'
 
-global.orderType={
-	USER_PAY:'USER_PAY',
-	AGENT_CHARGE:'AGENT_CHARGE',
-	MALL_CHARGE:'MALL_CHARGE'
+global.platform = {
+	SHOP: "SHOP",
+	MALL: "MALL"
 }
 
-global.payStatus={
-	IS_WAIT:'0',
-	IS_PAY:'1',
-	IS_CANCEL:'2'
+global.userType = {
+	USER: "普通用户",
+	CHANNEL: "渠道代理",
+	CITY: "城市代理",
+	SHOP: "商户",
+	MALL: "商场",
 }
 
-global.wxParams={
-	APPID:'wx9ad53e8c83ae1a51'
+// global.agenterTypeId='1423464045809364994'
+global.agenterTypeId = 'agent_channel_setting'
+
+global.paymentScene = {
+	SCAN_CODE: 'SCAN_CODE',
+	TRANSFER: 'TRANSFER',
+	PAY_CODE: 'PAY_CODE',
+	MINI_PROGRAM: 'MINI_PROGRAM'
 }
 
-global.APPID={
-	nanyue:'wxd78a776416719686',//南粤药业
-	didi:'wxaf35009675aa0b2a',//滴滴出行
+global.paymentType = {
+	YEE_PAY: "YEE_PAY"
+}
+global.orderType = {
+	USER_PAY: 'USER_PAY',
+	AGENT_CHARGE: 'AGENT_CHARGE',
+	MALL_CHARGE: 'MALL_CHARGE'
 }
 
-//webSocket 收到服务端的信息
-global.socketMessage={
-	payForPaymentCode:'用户通过付款码付款',//商家扫描用户的付款码支付
+global.takeType = {
+	dine_in: '店内堂食',
+	package: '到店自取',
+	delivery: '商家配送'
 }
+global.takeTypeList = ['店内堂食', '到店自取', '商家配送']
 
+global.mustOrder = '必选'
 
-// 用户积分足够够有三种情况，分别是CHANNEL_ENOUGN、CHANNEL_ZERO_RARE_ENOUGH、CHANNEL_NOENOUGH_RARE_ENOUGH
-global.pointPayType={
-	//渠道积分足够支付
-	CHANNEL_ENOUGN:'CHANNEL_ENOUGN',
-	//渠道积分为0,用户余额为0
-	CHANNEL_ZERO_RARE_ZERO:'CHANNEL_ZERO_RARE_ZERO',
-	//渠道积分为0，用户余额够扣
-	CHANNEL_ZERO_RARE_ENOUGH:'CHANNEL_ZERO_RARE_ENOUGH',
-	//渠道积分为0，用户余额不够扣
-	CHANNEL_ZERO_RARE_NOENOUGH:'CHANNEL_ZERO_RARE_NOENOUGH',
-	//渠道积分不为0,用户余额为0
-	CHANNEL_NOENOUGH_RARE_ZERO:'CHANNEL_NOENOUGH_RARE_ZERO',
-	//渠道积分不为0，用户余额足够扣
-	CHANNEL_NOENOUGH_RARE_ENOUGH:'CHANNEL_NOENOUGH_RARE_ENOUGH',
-	//渠道积分不为0，用户余额不够扣
-	CHANNEL_NOENOUGH_RARE_NOENOUGH:'CHANNEL_NOENOUGH_RARE_NOENOUGH'
+global.payStatus = {
+	IS_WAIT: '待付款',
+	IS_PAY: '付款成功',
+	IS_CANCEL: '取消付款'
 }
 
+global.wxParams = {
+	APPID: 'wx9ad53e8c83ae1a51'
+}
 
-global.TRANSFORM_PARAMS='95963'
+global.TRANSFORM_PARAMS = '95963'
 
 
 export default global

pages.json

@@ -112,6 +112,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/auth/auth",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "微信认证",
+                "enablePullDownRefresh": false,
+				"navigationStyle":"custom"
+            }
+            
+        }
     ],
 	"subPackages": [{
 		//tarbar下mine的分包

pages/auth/auth.vue

@@ -0,0 +1,52 @@
+<!-- 这个是商户端微信认证所需的h5页面，三个端只有用户端有h5,故把商户端的微信认证h5页面放在此处一起打包 -->
+<template>
+	<view>
+		<u-mask :show="show" >
+			<view class="warp" style="margin-top: -50rpx;">
+				<image :show-menu-by-longpress="true" @error="error" style="width: 70%;" :src="src" mode="widthFix">
+				</image>
+				<view class="text-white text-sm margin-top-20">
+					<text>长按二维码关注公众号认证信息</text>
+				</view>
+			</view>
+		</u-mask>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: '',
+		data() {
+			return {
+				show: true,
+				src: ''
+			};
+		},
+		onLoad(options) {
+			this.src = options.src
+			if (this.$isEmpty(this.src)) {
+				this.$dialog.showModalAndBack('二维码获取失败')
+				return
+			}
+		},
+		methods: {
+			error() {
+				this.$dialog.showModalAndBack('二维码加载失败')
+			},
+			async saveImg() {
+				let res = await this.$mpi.downloadFile(this.src)
+				this.$mpi.saveImg(res)
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.warp {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		height: 100%;
+	}
+</style>

pagesC/pages/checkstand/index.vue

@@ -390,7 +390,7 @@
 				this.payShow=false
 			},
 			async cancelTrade(){
-				if (this.payConfirmType!='paySuccess') {
+				if (this.payConfirmType!='paySuccess' && this.$isNotEmpty(this.payParams)) {
 					let res=await this.$api.pay.cancelTrade(this.payParams)
 				}
 			}