Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong_qianduan

ext.json

@@ -1,6 +1,6 @@
 {
 	"extEnable": true,
-	"extAppid": "wxa3127ed5c3542a28",
+	"extAppid": "wx9f7e94fe11dc0c23",
 	"ext": {
 		"store_id": 10048
 	}

pages/goods/list.vue

@@ -3,6 +3,7 @@
 		<mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true,auto: false}"
 			@down="downCallback" :up="upOption" @up="upCallback">
 			<!-- 页面头部 -->
+			<view class="head">
 				<view class="header">
 					<view class="search">
 						<search :tips="options.search ? options.search : '搜索商品'" @event="handleSearch" />
@@ -64,7 +65,8 @@
 						</view> -->
 					</view>
 				</view>
-
+			</view>
+			<view class="blank"></view>
 			<!-- 商品列表 -->
 			<view class="goods-list clearfix" :class="['column-' + (showView ? '1' : '2')]">
 				<view v-if="showView">
@@ -372,9 +374,10 @@
 						this.keyName2 = item.name
 					}
 				}
-				this.list.data = []
 				this.$refs.uWaterfall1.clear();
-				this.getGoodsList()
+				this.list.data = []
+				this.list = []
+				this.mescroll.resetUpScroll()
 			},
 			/**
 			 * 上拉加载的回调 (页面初始化时也会执行一次)
@@ -542,7 +545,18 @@
 	::v-deep .u-empty {
 		padding: 100rpx 0;
 	}
-
+	.head{
+		width: 100%;
+		overflow: hidden;
+		background-color: #fff;
+		position: fixed;
+		z-index: 99;
+		width: 100%;
+		left: 0;
+	}
+	.blank{
+		height: 416rpx;
+	}
 	// 页面头部
 	.header {
 		background-color: #fff;
@@ -572,12 +586,8 @@
 
 	// 排序组件
 	.store-sort {
-		position: sticky;
-		top: var(--window-top);
-		background-color: #fff;
 		color: #000;
-		z-index: 99;
+		width: 100%;
-
 		.store-box {
 			display: flex;
 			padding: 20rpx 0;

pages/invite/index.vue

@@ -71,9 +71,9 @@
 		<!--  -->
 		<view class="invite-popup" v-if="isPopup">
 			<view class="popup">
-				<image class="bg" show-menu-by-longpress src="https://www.royaum.com.cn/static/3@2x.png"></image>
+				<image class="bg" show-menu-by-longpress :src="qrcode1"></image>
-				<image class="code" show-menu-by-longpress :src="qrcode"></image>
+				<!-- <image class="code" show-menu-by-longpress :src="qrcode"></image>
-				<view class="qrcode">{{userInfo.user_id}}</view>
+				<view class="qrcode">{{userInfo.user_id}}</view> -->
 				<view class="tips">
 					<view class="cancle" @click="download(1)">取消</view>
 					<view class="sure" @click="download(2)">保存到相册</view>
@@ -95,6 +95,7 @@
 	export default {
 		data() {
 			return {
+				qrcode1: "",
 				qrcode: "",
 				userInfo: {},
 				backgroundBg: {
@@ -161,21 +162,24 @@
 									success: function(res) {
 										// 在H5平台下，tempFilePath 为 base64
 										console.log(res.tempFilePath)
-										uni.saveImageToPhotosAlbum({
+										that.qrcode1 = res.tempFilePath;
-											filePath: res.tempFilePath,
+										that.isPopup = true;
-											success(data) {
+										ctx.clearRect(0,0,702,1248);
-												that.$success('保存成功')
+										// uni.saveImageToPhotosAlbum({
-											},
+										// 	filePath: res.tempFilePath,
-											fail(err) {
+										// 	success(data) {
-												if (err.errMsg ===
+										// 		that.$success('保存成功')
-													'saveImageToPhotosAlbum:fail auth deny'
+										// 	},
-												) {
+										// 	fail(err) {
-													that.$toast(
+										// 		if (err.errMsg ===
-														'请允许访问相册后重试 (右上角菜单 - 设置 - 相册)',
+										// 			'saveImageToPhotosAlbum:fail auth deny'
-														3000)
+										// 		) {
-												}
+										// 			that.$toast(
-											}
+										// 				'请允许访问相册后重试 (右上角菜单 - 设置 - 相册)',
-										})
+										// 				3000)
+										// 		}
+										// 	}
+										// })
 									}
 								})
 
@@ -230,8 +234,8 @@
 				} = await newFunApi.InviteUserPoster({});
 				if (status == 200) {
 					console.log(data)
-					this.isPopup = true;
+					this.qrcode = data.imageUrl;
-					this.qrcode = data.imageUrl
+					this.createImge();
 				}
 			},
 			download(type) {
@@ -243,7 +247,8 @@
 					uni.showLoading({
 						title: '加载中'
 					})
-					this.createImge();
+					app.onSaveImage(app.qrcode1)
+					// this.createImge();
 				}
 				return;
 				uni.showLoading({
@@ -331,7 +336,12 @@
 						url: "/pages/news/user/withdrawal?balance=" + this.userInfo.withdrawal_money
 					})
 				} else if (index == 3) {
+					if(!this.qrcode1){
 						this.InviteUserPoster();
+					}else{
+						this.isPopup = true;
+					}
+					
 				} else if (index == 4) {
 					uni.navigateTo({
 						url: "/pages/invite/rule"