2021-10-13

manifest.json

@@ -2,8 +2,8 @@
     "name" : "满园春线上商城",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 111,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     "uniStatistics" : {
         "enable" : false //全局关闭  
@@ -20,7 +20,9 @@
         "modules" : {
             "OAuth" : {},
             "Share" : {},
-            "Payment" : {}
+            "Payment" : {},
+            "Geolocation" : {},
+            "Maps" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -79,7 +81,8 @@
                         "UniversalLinks" : "https://yrh.liuniu946.com/links/"
                     }
                 },
-                "ad" : {}
+                "ad" : {},
+                "geolocation" : {}
             },
             "icons" : {
                 "android" : {

pages/address/addressManage.vue

@@ -156,7 +156,8 @@ export default {
 						}
 					});
 				})
-				.catch(e => {
+				.catch(e => {
+					console.log(e)
 					uni.hideLoading();
 					uni.showModal({
 						title: '提示',

pages/index/index.vue

@@ -5,7 +5,7 @@
 			<!-- 背景色区域 -->
 			<view class="bg"><image src="../../static/img/index.png" mode=""></image></view>
 			<!-- 标题栏和状态栏占位符 -->
-			<!-- <view class="titleNview-placing"></view> -->
+			<view class="titleNview-placing"></view>
 			<!-- 搜素栏 -->
 			<view class="search flex">
 				<image src="../../static/icon/address.png" class="address"></image>
@@ -53,7 +53,7 @@
 		</view>
 
 		<!-- 积分兑换 -->
-		<view class="main-box">
+		<!-- <view class="main-box">
 			<view class="main-top">
 				<image src="../../static/icon/indexI.png" mode="" class="main-icon"></image>
 				<view class="main-title">积分兑换</view>
@@ -79,7 +79,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 消费券专区 -->
 		<view class="main-box">
 			<view class="main-top">
@@ -362,7 +362,6 @@ page {
 	}
 	.titleNview-placing {
 		height: var(--status-bar-height);
-		padding-top: 44px;
 		box-sizing: content-box;
 	}
 	.search {

pages/merchant/finance.vue

@@ -18,7 +18,7 @@
 						<image src="../../static/icon/dayget.png" mode=""></image>
 						<view class="info-wrap">
 							<view class="info-tit">今日营业额</view>
-							<view class="info-val">￥{{ today_momey }}</view>
+							<view class="info-val">￥{{ today_momey || 0 }}</view>
 						</view>
 					</view>
 					<view class="card-info flex">

pages/shareQrCode/index.vue

@@ -96,36 +96,36 @@ export default {
 				});
 		}
 	},
-	onReady() {
-		let obj = this;
-		let query = uni.createSelectorQuery();
-		// 获取页面比例
-		query
-			.select('.content')
-			.fields(
-				{
-					size: true
-				},
-				e => {
-					// 保存比例
-					this.ratio = e.width / 750;
-				}
-			)
-			.exec();
-		// 获取画布宽高信息
-		query
-			.select('#qrShareBox')
-			.fields(
-				{
-					size: true
-				},
-				e => {
-					obj.canHeight = e.height;
-					obj.canWeidth = e.width;
-				}
-			)
-			.exec({});
-	},
+	// onReady() {
+	// 	let obj = this;
+	// 	let query = uni.createSelectorQuery();
+	// 	// 获取页面比例
+	// 	query
+	// 		.select('.content')
+	// 		.fields(
+	// 			{
+	// 				size: true
+	// 			},
+	// 			e => {
+	// 				// 保存比例
+	// 				this.ratio = e.width / 750;
+	// 			}
+	// 		)
+	// 		.exec();
+	// 	// 获取画布宽高信息
+	// 	query
+	// 		.select('#qrShareBox')
+	// 		.fields(
+	// 			{
+	// 				size: true
+	// 			},
+	// 			e => {
+	// 				obj.canHeight = e.height;
+	// 				obj.canWeidth = e.width;
+	// 			}
+	// 		)
+	// 		.exec({});
+	// },
 	methods: {
 		// 设置分享数据
 		setShare() {
@@ -168,18 +168,19 @@ export default {
 					console.log(e);
 					// 保存二维码图片
 					// this.src = e.data.real_url;
-					obj.ctxSrc = e.data.wap_poster;
+					obj.ctxSrc = e.data[0].wap_poster;
 					// 生成画布
 					// this.loadImg(e.data.real_url);
 					uni.hideLoading();
 					// 加载分享数据
-					obj.setShare()
+					// obj.setShare()
 				})
 				.catch(e => {
-					uni.showModal({
-						title: '生成失败请刷新页面',
-						showCancel: false
-					});
+					console.log(e)
+					// uni.showModal({
+					// 	title: '生成失败请刷新页面',
+					// 	showCancel: false
+					// });
 					uni.hideLoading();
 				});
 		},
@@ -298,10 +299,7 @@ export default {
 	top: -9999rpx;
 }
 .tki-qrcode-canvas {
-	// width: 700rpx;
-	// height: 1245rpx;
 	width: 750rpx;
-	// height: 945rpx;
 	margin: 0 auto;
 }
 .share-bottom {

pages/wallet/recharge.vue

@@ -70,6 +70,7 @@ export default {
 			// #ifdef APP-PLUS
 			weichatBsrowser: true
 			// #endif
+			nowmoney:0
 		};
 	},
 	onLoad(options) {