修改

App.vue

@@ -7,6 +7,7 @@
 			//获取token
 			this.getToken()
 			//获取小程序上下线
+			// this.$u.vuex('vuex_audit',1)
 			this.getAudit()
 		},
 		methods:{

assets/http/global.js

@@ -1,15 +1,15 @@
 let global = {}
 
 
-// const application='prod'
+const application='prod'	
 // const application='dev'
-const application='test'
+// const application='test'
 
 if (application == 'prod') {
 	//正式环境
 	global.baseUrl = 'https://ldt.guosen-fumao.cn/api/'
 	global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
-	global.enabledCrypto = false
+	global.enabledCrypto = true
 }else if (application == 'dev') {
 	//开发环境
 	global.baseUrl = 'http://192.168.1.168:2366/'

components/channel-list.vue

@@ -3,7 +3,7 @@
 		<view v-if="$isNotEmpty(channel)" @click="channelShow=true" class="channel " style="width: 100%;">
 			<view class="left">
 				<view class="center">
-					<image :src="item.channelLogo?item.channelLogo:'/static/icon/channel.png'" mode=""></image>
+					<image :src="channel.channelLogo?channel.channelLogo:'/static/icon/channel.png'" mode=""></image>
 				</view>
 				<view class="content">
 					<text>{{channel.channelName}}</text>

pages.json

@@ -103,7 +103,16 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/test/test2",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"subPackages": [{
 		//tarbar下mine的分包
 		"root": "pagesA",

pages/consume/comps/card1.vue

@@ -21,7 +21,7 @@
 						</view>
 						<view v-if="vuex_audit==1" @click.stop="$jump(`/pagesD/pages/menu/menu?shopId=${item.id}`)" class="text-base center" style="font-size: 26rpx;font-weight: normal;">
 							<image class="" style="width: 32rpx;height: 32rpx;margin-right: 4rpx;" src="@/static/icon/order.png" mode=""></image>
-							<text>去点餐</text>
+							<text>去下单</text>
 						</view>
 						
 					</view>

pages/consume/detail/shop-detail.vue

@@ -27,7 +27,7 @@
 		<navigator v-if="vuex_audit==1" hover-class="none" :url="'/pagesD/pages/menu/menu?shopId='+id" class="homeBtn">
 			<view class="flex">
 				<image src="/static/icon/goOrder.png" style="width: 36upx;height: 36upx;" />
-				<text class="margin-left-10">点餐</text>
+				<text class="margin-left-10">下单</text>
 			</view>
 		</navigator>
 	</view>

pages/mine/mine.vue

@@ -8,7 +8,7 @@
 			<view class="card">
 				<view class="info" v-if="vuex_userId">
 					<view class="flex margin-right-20">
-						<image class="avatar"  :src="userInfo.avatar"></image>
+						<u-avatar :src="userInfo.avatar" size="100"></u-avatar>
 						<view class="nickname">
 							<block style="display: flex;">
 								<text >{{userInfo.nickName}}</text>

pages/order/comps/card.vue

@@ -18,7 +18,7 @@
 				<view class="flex flex-direction" style="line-height: 50rpx;">
 					<text>下单时间：{{item.createTime}}</text>
 					<block>
-						<text>点菜计数:{{item.goodsTotalNum}}</text>
+						<text>商品数量:{{item.goodsTotalNum}}</text>
 						<view v-show="false">
 							<u-count-down v-if="item.payStatus=='待付款'&& item.orderStatus!='取消付款'" @end="timeup(item)"  :timestamp="getExpireTime(item)"></u-count-down>
 						</view>

pages/order/order.vue

@@ -31,7 +31,6 @@
 		},
 		methods: {
 			timeup(item){
-				return
 				let order = this.$u.deepClone(item)
 				order.payStatus = '取消付款'
 				order.orderStatus = '取消付款'

pages/test/test.vue

@@ -1,48 +1,25 @@
 <template>
 	<view class="">
-
+		
 	</view>
 </template>
 
 <script>
-	import md5Libs from "uview-ui/libs/function/md5";
-	import crypto from "../../utils/crypto.js"
-	export default {
-		name: '',
-		data() {
-			return {
-
-			};
-		},
-		onLoad() {
-			this.remove()
-		},
-		methods: {
-			list() {
-				this.$api.shop.list({
-					id: '1453602587696812034'
-				}).then(res => {
-					console.log(res, "/******");
-				})
-			},
-			submit() {
-				let params = {
-					"phone": "19124812874",
-					"secret": "123456"
-				}
-				this.$api.test.submit(params).then(res => {
-					console.log(res);
-				})
-			},
-			remove() {
-				this.$api.test.remove("1455095357455790082").then(res => {
-					console.log(res);
-				})
-			}
-		}
-	};
+export default {
+	name: '',
+	data() {
+		return {
+			
+		};
+	},
+	onLoad(options) {
+		uni.redirectTo({
+			url:"/pages/test/test2?result="+options
+		})
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-
-</style>
+	
+</style>

pages/test/test2.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		<text>授权结果页</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/webview/webview.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<web-view :src="url"></web-view>
+		<web-view src="https://test-m-stg.ppppoints.com/event/2019/blankPage/index.html?interCode=CYS0001&character=00&ipAddress=121.77.145.18&partnerId=S9990141&requestId=1454264898547634177386606_KB_001&reqTime=20211115095723&signType=MD5&type=mobile&version=1.0.0&mobile=19124812881&outTokenId=19124812881_out&outType=00&callbackUrl=https%3A%2F%2Fldt.guosen-fumao.cn%2Fh5%2F%23%2Fpages%2Ftest%2Ftest&channelSource=02000000&reserved1=&reserved2=&hmac=72ac713bbaeb99dcd8dce1904adffce1"></web-view>
+		<!-- <web-view :src="url"></web-view> -->
 	</view>
 </template>
 

pagesA/pages/notice/detail.vue

@@ -43,14 +43,14 @@
 				 })
 			 },
 			 jump(){
-				 if (this.dataDetail.senderType == 'SHOP') {
+				 if (this.dataDetail.noticeManagementContent.senderType == 'SHOP') {
 				 	uni.navigateTo({
-				 		url:"/pages/consume/detail/shop-detail?id="+this.dataDetail.senderId
+				 		url:"/pages/consume/detail/shop-detail?id="+this.dataDetail.noticeManagementContent.senderId
 				 	})
 				 }
-				 if (this.dataDetail.senderType == 'MALL') {
+				 if (this.dataDetail.noticeManagementContent.senderType == 'MALL') {
 				 	uni.navigateTo({
-				 		url:"/pages/activity/activity?id="+this.dataDetail.senderId
+				 		url:"/pages/activity/activity?id="+this.dataDetail.noticeManagementContent.senderId
 				 	})
 				 }
 			 }

pagesC/pages/checkstand/pay-qrcode.vue

@@ -160,7 +160,7 @@
 				this.timer = setInterval(() => {
 					this.secret = totp.getSecret(this.id);
 					console.log(this.secret);
-				}, 10000)
+				}, 1000)
 			},
 			getSecret(){
 				this.secret = totp.getSecret(this.id);

pagesD/pages/pay/pay.vue

@@ -303,12 +303,28 @@
 					this.takeTime = this.$dateTime.format(new Date(data.date))
 				}
 			},
+			getGoodsPreview(){
+				let goodsPreview=[]
+				this.cart.forEach(item=>{
+					let obj={
+						image:item.image,
+						name:item.name,
+						propertyStr:item.propertyStr,
+						number:item.number,
+						realPrice:item.realPrice,
+						defaultPrice:item.defaultPrice
+					}
+					goodsPreview.push(obj)
+				})
+				return JSON.stringify(goodsPreview)
+			},
 			async order() {
+				let goodsPreview=this.getGoodsPreview()
 				let params = {
 					receiveId: this.shopId,
 					payId: this.vuex_userId,
 					takeType: this.takeType,
-					goodsPreview: JSON.stringify(this.cart),
+					goodsPreview,
 					goodsTotalNum: this.totalNum,
 					totalPrice: this.total,
 					extraInfo: this.remark,
@@ -383,6 +399,10 @@
 					payStatus: this.$global.payStatus.IS_WAIT
 				}
 				let res = await this.$api.pay.payOrder(obj)
+				if (this.$isEmpty(res.data.prePayTn)) {
+					this.$refs.toast.error(res.data.message)
+					return
+				}
 				let prePayTn = JSON.parse(res.data.prePayTn)
 				this.$mpi.requestPayment(prePayTn).then(() => {
 					this.handelResult(true)