zs преди 2 години
родител
ревизия
0bd5a25cda
променени са 1 файла, в които са добавени 14 реда и са изтрити 25 реда
  1. 14 25
      pagesHome/shop/index.vue

+ 14 - 25
pagesHome/shop/index.vue

@@ -10,7 +10,8 @@
 						<scroll-view scroll-y="true" class="scroll-view">
 						<scroll-view scroll-y="true" class="scroll-view">
 							<view class="list-scroll-view">
 							<view class="list-scroll-view">
 								<view class="list" v-for="(item,index) in shoplist" :key="index">
 								<view class="list" v-for="(item,index) in shoplist" :key="index">
-									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
+									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+										mode=""></image>
 									<view class="name">
 									<view class="name">
 										{{item.name}}
 										{{item.name}}
 									</view>
 									</view>
@@ -36,17 +37,20 @@
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
 							<view class="list-scroll-view">
 							<view class="list-scroll-view">
 								<view class="second_1">
 								<view class="second_1">
-									<view :class="['list',condActive==index?'activeList':'']" v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
+									<view :class="['list',condActive==index?'activeList':'']"
+										v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
 										<view class="name">
 										<view class="name">
 											{{item.name}}
 											{{item.name}}
 										</view>
 										</view>
 										<view class="icon">
 										<view class="icon">
 											<view class="icon_1">
 											<view class="icon_1">
-												<text :class="['iconfont',item.shangActive]" v-if="condActive==index&&shang=='1'"></text>
+												<text :class="['iconfont',item.shangActive]"
+													v-if="condActive==index&&shang=='1'"></text>
 												<text :class="['iconfont',item.shang]" v-else></text>
 												<text :class="['iconfont',item.shang]" v-else></text>
 											</view>
 											</view>
 											<view class="icon_1">
 											<view class="icon_1">
-												<text :class="['iconfont', item.xiaActive]" v-if="condActive==index&&xia=='-1'"></text>
+												<text :class="['iconfont', item.xiaActive]"
+													v-if="condActive==index&&xia=='-1'"></text>
 												<text :class="['iconfont', item.xia]" v-else></text>
 												<text :class="['iconfont', item.xia]" v-else></text>
 											</view>
 											</view>
 										</view>
 										</view>
@@ -54,7 +58,8 @@
 								</view>
 								</view>
 								<view class="second_2">
 								<view class="second_2">
 									<view class="list" v-for="(item,index) in list" :key="index">
 									<view class="list" v-for="(item,index) in list" :key="index">
-										<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
+										<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+											mode=""></image>
 										<view class="sale" v-if="item.is_sale==true">
 										<view class="sale" v-if="item.is_sale==true">
 											<text>已售尽</text>
 											<text>已售尽</text>
 										</view>
 										</view>
@@ -97,7 +102,7 @@
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="second_2">
 						<view class="second_2">
-							<view class="second_2_bor" @tap="saveQrcode">
+							<view class="second_2_bor">
 								<canvas class="qrcode" canvas-id="myQrcode"></canvas>
 								<canvas class="qrcode" canvas-id="myQrcode"></canvas>
 							</view>
 							</view>
 							<view class="txt">
 							<view class="txt">
@@ -131,15 +136,6 @@
 		components: {},
 		components: {},
 		data() {
 		data() {
 			return {
 			return {
-				val: '', // 要生成的二维码值
-				size: 300, // 二维码大小
-				unit: 'upx', // 单位
-				background: '#FFFFFF', // 背景色
-				foreground: '#000000', // 前景色
-				pdground: '#000000', // 角标色
-				onval: true, // val值变化时自动重新生成二维码
-				loadMake: true, // 组件加载完成后自动生成二维码
-				src: '', // 二维码生成后的图片地址或base64
 				user: {},
 				user: {},
 				id: '',
 				id: '',
 				barActive: '0',
 				barActive: '0',
@@ -213,12 +209,6 @@
 		},
 		},
 		onShow: function() {},
 		onShow: function() {},
 		methods: {
 		methods: {
-			qrR(res) {
-				this.src = res
-			},
-			saveQrcode() {
-				this.$refs.qrcode._saveCode()
-			},
 			// 监听用户是否登录
 			// 监听用户是否登录
 			watchLogin() {
 			watchLogin() {
 				const that = this;
 				const that = this;
@@ -287,14 +277,13 @@
 			},
 			},
 			// 创建二维码
 			// 创建二维码
 			createQrcode(e) {
 			createQrcode(e) {
-				// console.log(e);
 				const that = this;
 				const that = this;
 				const url = `${that.$config.serverUrl}/shopinfo?id=${e._id}`;
 				const url = `${that.$config.serverUrl}/shopinfo?id=${e._id}`;
 				var qrcode = new QRCode(`myQrcode`, {
 				var qrcode = new QRCode(`myQrcode`, {
 					text: url,
 					text: url,
-					width: 110,
-					height: 110,
-					padding: 3,
+					width: 172.5,
+					height: 150,
+					padding: 2,
 					colorDark: "#000000",
 					colorDark: "#000000",
 					colorLight: "#ffffff",
 					colorLight: "#ffffff",
 					correctLevel: QRCode.CorrectLevel.L,
 					correctLevel: QRCode.CorrectLevel.L,