api type更改

framework/0-conf.js

@@ -5,8 +5,9 @@ const proxyApi = "/api"
 // #ifdef MP-WEIXIN || MP-ALIPAY
 const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
 const baseUrlwws = 'wss://cashier.sxczgkj.cn/cashierService' // 线上
-// const baseUrl = "https://cashierapplet.sxczgkj.cn/cashierService"  //测试
-// const baseUrlwws = 'wss://cashierapplet.sxczgkj.cn/cashierService' // 测试
+// const baseUrl = "https://wxcashiertest.sxczgkj.cn/cashierService"  //测试
+// const baseUrlwws = 'wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+
 // #endif
 // #ifdef H5
 const baseUrl = debug ? proxyApi : 'http://192.168.2.161:9889/cashierService/' // 线上

framework/11-api.js

@@ -62,7 +62,7 @@ async function request(options) {
 		if (options.type == 1) {
 			options.header = {
 				token: uni.cache.get('token'),
-				openId: uni.cache.get('miniAppOpenId'),
+				openId: uni.cache.get('userInfo').miniAppOpenId,
 				id: uni.cache.get('userInfo').id,
 			}
 		} else {
@@ -194,7 +194,8 @@ function get(url, data, toast = true, type = 1) {
 	return request({
 		url,
 		data,
-		toast
+		toast,
+		type
 	})
 }
 
@@ -213,7 +214,8 @@ function post(url, data, toast = true, method = 'POST', type = 1) {
 		url,
 		method,
 		data,
-		toast
+		toast,
+		type
 	})
 }
 

pages/login/login.vue

@@ -195,7 +195,7 @@
 					margin-top: 60rpx;
 
 					.containerbottomone {
-						padding: 10rpx 80rpx;
+						padding: 10rpx 60rpx;
 						font-size: 24rpx;
 					}
 
@@ -208,7 +208,7 @@
 						font-size: 24rpx;
 						background: #baf505;
 						border: none;
-						padding: 10rpx 80rpx;
+						padding: 10rpx 60rpx;
 					}
 
 					.containerbottomtow::after {

pages/order/order_detail.vue

@@ -86,9 +86,9 @@
 			</view>
 		</view>
 
-		<!-- <view class="card" style="padding-bottom: 20rpx;">
-			<image :src="srcimge" show-menu-by-longpress="true" style="width: 100%;" mode="widthFix"></image>
-		</view> -->
+		<view class="card" style="padding-bottom: 20rpx;" v-if="listinfo.shopQrcode">
+			<image :src="listinfo.shopQrcode" show-menu-by-longpress="true" style="width: 100%;" mode="widthFix"></image>
+		</view>
 
 		<view :style="{height:height}">