Merge pull request 'dev-hxf' (#33) from dev-hxf into master

Reviewed-on: http://114.55.169.15:3000/huxiaofeng666/jwl-applet/pulls/33

src/App.vue

@@ -1,16 +1,21 @@
 <script>
 import useUserStore from '@/jtools/store/user'
 import useQuestionStore from '@/jtools/store/question' //引入store
+import storage from './jtools/storage'
 export default {
-  onLaunch: function () {
+  onLaunch: function (options) {
+    // 如果是二维码扫描过来的，需要保存公司id
+    if (options.query?.scene) {
+      storage.set('companyId', options.query?.scene)
+    }
     useUserStore().queryVipList()
-    if(useUserStore().isLogin) {
+    if (useUserStore().isLogin) {
       useUserStore().getUserInfo()
       useUserStore().searchUserVip()
     }
   },
   onShow: function () {
-		useQuestionStore().getAllQuestion()
+    useQuestionStore().getAllQuestion()
     console.log('App Show')
   },
   onHide: function () {
@@ -23,5 +28,8 @@ export default {
 /*每个页面公共css */
 @import "uni_modules/uview-plus/index.scss";
 @import "static/style/index.scss";
-button::after{ border: none;}
+
+button::after {
+  border: none;
+}
 </style>

src/jtools/store/user.js

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
-import { login,logout,getInfo } from '@/jtools/api/login';
+import { login, logout, getInfo } from '@/jtools/api/login';
-import { queryVip,getVipList } from '@/jtools/api/vip'
+import { queryVip, getVipList } from '@/jtools/api/vip';
 import constants from '@/jtools/constants';
 import storage from '@/jtools/storage';
 
@@ -16,76 +16,77 @@ const useUserStore = defineStore({
   }),
 
   actions: {
-		login(params) {
+    login(params) {
-		  return new Promise(async (resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-		    const resp = await login(params);
+        const resp = await login(params);
-		    if (resp.code === '0000') {
+        if (resp.code === '0000') {
-		      // 保存登录信息，用于重新登录
+          // 保存登录信息，用于重新登录
-		      this.isLogin = true;
+          this.isLogin = true;
-		      this.token = resp.data.token;
+          this.token = resp.data.token;
-          this.userInfo = resp.data
+          this.userInfo = resp.data;
-          storage.set('isLogin', true)
+          storage.set('isLogin', true);
-          storage.set('token', resp.data.token)
+          storage.set('token', resp.data.token);
-          storage.set('userInfo', resp.data)
+          storage.set('userInfo', resp.data);
-		      resolve(resp.data);
+          storage.remove('companyId');
-		    } else {
+          resolve(resp.data);
-		      reject();
+        } else {
-		    }
+          reject();
-		  });
+        }
-		},
+      });
+    },
     // 登出
     logout(force = false) {
       return new Promise((resolve, reject) => {
         this.resetUserData();
         uni.redirectTo({
           url: '/pages/login/login'
-        })
+        });
         resolve();
-      })
+      });
+    },
+    //过期登出
+    logoutWithoutToken(force = false) {
+      return new Promise((resolve, reject) => {
+        this.resetUserData();
+        resolve();
+      });
     },
-		//过期登出
-		logoutWithoutToken(force = false) {
-		  return new Promise((resolve, reject) => {
-		    this.resetUserData();
-		    resolve();
-		  })
-		},
     // 获取用户信息
     getUserInfo() {
       getInfo().then(resp => {
-        if(resp.code == '0000') {
+        if (resp.code == '0000') {
-          this.userInfo = resp.data
+          this.userInfo = resp.data;
-          storage.set('userInfo', resp.data)
+          storage.set('userInfo', resp.data);
         }
-      })
+      });
     },
     resetUserData() {
       this.isLogin = false;
       this.token = '';
-      this.userInfo = {}
+      this.userInfo = {};
-      this.vipOnList = []
+      this.vipOnList = [];
-      storage.remove('isLogin')
+      storage.remove('isLogin');
-      storage.remove('token')
+      storage.remove('token');
-      storage.remove('userInfo')
+      storage.remove('userInfo');
     },
     // 查询当前用户的vip开通情况
     async searchUserVip() {
-			this.currentCartype=storage.get('carType') || '1001'
+      this.currentCartype = storage.get('carType') || '1001';
-     const resp=await queryVip({ carTypeId: this.currentCartype,memberId: null, subject:'' })
+      const resp = await queryVip({ carTypeId: this.currentCartype, memberId: null, subject: '' });
-        if(resp.code == '0000') {
+      if (resp.code == '0000') {
-          this.vipOnList = resp.data
+        this.vipOnList = resp.data;
-        }
+      }
     },
     // 查询所有的vip
     queryVipList() {
-			this.currentCartype= storage.get('carType') || '1001'
+      this.currentCartype = storage.get('carType') || '1001';
-      getVipList({ carTypeId: this.currentCartype,memberId: null, subject:'' }).then(resp => {
+      getVipList({ carTypeId: this.currentCartype, memberId: null, subject: '' }).then(resp => {
-        if(resp.code == '0000') {
+        if (resp.code == '0000') {
-          this.vipAllList = resp.data
+          this.vipAllList = resp.data;
         }
-      })
+      });
     }
-  },
+  }
 });
 
 export default useUserStore;

src/pages/index/videoVip.vue

@@ -4,12 +4,15 @@
 			<image style="width: 100%;height: 600rpx;" src="https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/vip%E9%A2%98%E5%BA%93_20230911211532.png"></image>
 			<view style="margin-bottom: 100px;">
 				<view class="flex jc-fa ai-c wp100 p14">
-					<view style="width: 33.3%;" v-for="(item,index) of priceList" :key="index">
+					<view style="width: 33.3%;" v-for="(item, index) of priceList" :key="index">
-						<view class="option_tem relative" :class="checkedId===item.memberId?'checked_item':''"  @click="checkPrice(item.memberId,item.price)">
+						<view class="option_tem relative" :class="checkedId === item.memberId ? 'checked_item' : ''"  @click="checkPrice(item.memberId, item.price)">
-							<text class="fw600 fs12 cor-333">{{item.memberName}}</text>
+							<text class="fw600 fs12 cor-333">{{ item.memberName }}</text>
-							<view class="mt5">
+							<view class="mt5" v-if="!isIOS">
 								<text class="fs14" style="color: #FF6E02;">¥</text>
-								<text class="fs30 fw600" style="color: #FF6E02;">{{item.price}}</text>
+								<text class="fs30 fw600" style="color: #FF6E02;">{{ item.price }}</text>
+							</view>
+							<view v-else class="mt5">
+								<text class="fs14" style="color: #FF6E02;">iOS暂不支持</text>
 							</view>
 							<text class="fs12 cor-999">一年有效</text>
 							<!-- <view class="bottom_box fs12 cor-333" :class="checkedId===item.memberId?'checked_bottom':''">赠送vip题库</view> -->
@@ -21,12 +24,12 @@
 				</view>
 				<view class="intr_box p14">
 					<view class="fw600 fs16 cor-000">尊享以下权益</view>
-					<view class="flex ai-c jc-sb mt15" v-if="subject=='1'||subject=='4'">
+					<view class="flex ai-c jc-sb mt15" v-if="subject == '1' || subject == '4'">
 						<view class="text-center" style="width: 33%">
 							<view class="wp100 flex ai-c jc-c mb5">
 								<image style="width: 63rpx;height: 63rpx;margin-right: 5px;" src="../../static/image/index/vip500.png"></image>
 							</view>
-							<text>精简{{titleNum}}题</text>
+							<text>精简{{ titleNum }}题</text>
 						</view>
 						<view class="text-center" style="width: 33%;">
 							<view class="wp100 flex ai-c jc-c mb5">
@@ -59,14 +62,14 @@
 						</view>
 					</view>
 				</view>
-				<view class="wp100 mt15" v-if="subject=='1'||subject=='4'">
+				<view class="wp100 mt15" v-if="subject == '1' || subject == '4'">
 					<image class="wp100" mode="widthFix" :src="picUrl"></image>
 				</view>
 			</view>
 			</view>
-		<view class="wp100 p14" style="position: absolute;left: 0;bottom:20px" @tap="handlePay()">
+		<view v-if="!isIOS" class="wp100 p14" style="position: absolute;left: 0;bottom:20px" @tap="handlePay()">
 			<view class="sub_btn flex ai-c jc-sb">
-				<text class="cor-fff fs14">¥<text class="fs24 cor-fff">{{nowPrice}}</text></text>
+				<text class="cor-fff fs14">¥<text class="fs24 cor-fff">{{ nowPrice }}</text></text>
 				<image style="width: 276rpx;height: 88rpx;margin-top: -5px;" src="../../static/image/index/buy.png"></image>
 			</view>
 		</view>
@@ -74,187 +77,197 @@
 </template>
 
 <script>
-	import {
+import {
-		mapState,
+	mapState,
-		mapActions
+	mapActions
-	} from 'pinia' //引入映射函数
+} from 'pinia' //引入映射函数
-	import { getVipList } from '@/jtools/api/vip'
+import { getVipList } from '@/jtools/api/vip'
-	import { querySysConfig } from '@/jtools/api/question';
+import { querySysConfig } from '@/jtools/api/question';
-	import storage from '@/jtools/storage';
+import storage from '@/jtools/storage';
-	import Pay from '@/jtools/pay/index.js';
+import Pay from '@/jtools/pay/index.js';
-	import useUserStore from '@/jtools/store/user'
+import useUserStore from '@/jtools/store/user'
-	export default {
+export default {
-		data(){
+	data() {
-			return{
+		return {
-				picUrl:'',
+			picUrl: '',
-				titleNum:500,
+			titleNum: 500,
-				subject:'1',
+			subject: '1',
-				loading:true,
+			loading: true,
-				nowPrice:168,
+			nowPrice: 168,
-				checkedId:0,
+			checkedId: 0,
-				priceList:[],
+			priceList: [],
-				order:{
+			order: {
-					money:0,
+				money: 0,
-					description:'会员充值'
+				description: '会员充值'
+			},
+			isIOS: true
+		}
+	},
+	onLoad(op) {
+		this.isIOS = this.$platform.device().includes('ios')
+		if (op.subject) {
+			this.subject = op.subject
+		}
+		this.loading = true
+		this.getVipList()
+		this.getWXOpenId()
+		this.getTitle()
+		this.getPic()
+		this.$set(this.order, 'userId', this.userInfo.userId);
+	},
+	computed: {
+		...mapState(useUserStore, ["userInfo"])
+	},
+	methods: {
+		getPic() {
+			const currentCartype = storage.get('carType') || '1001'
+			querySysConfig(currentCartype, 'VipDescImageUrl').then(res => {
+				this.picUrl = JSON.parse(res.data.configJson).url
+			})
+		},
+		getTitle() {
+			const carId = storage.get('carType') || '1001'
+			querySysConfig(carId, 'SimplifyQuestionNum').then(resp => {
+				if (resp.code === '0000') {
+					const list = JSON.parse(resp.data.configJson)
+					this.titleNum = list.find(item => item.subject == this.subject).num
 				}
+			})
+		},
+		async handlePay() {
+			if (this.loading) {
+				this.loading = false
+				await this.getWXOpenId()
+				new Pay('wechat', this.order);
+				this.loading = true
 			}
 		},
-		onLoad(op){
+		getWXOpenId() {
-			if(op.subject){
+			const that = this
-				this.subject=op.subject
+			uni.login({
-			}
+				success(res) {
-			this.loading=true
+					that.$set(that.order, 'code', res.code);
-			this.getVipList()
+				}
-			this.getWXOpenId()
+			})
-			this.getTitle()
-			this.getPic()
-			this.$set(this.order, 'userId', this.userInfo.userId);
 		},
-		computed: {
+		getVipList() {
-			...mapState(useUserStore, ["userInfo"]) 
+			getVipList({
-		},
+				carTypeId: storage.get('carType') || '1001',
-		methods:{
+				subject: this.subject
-			getPic(){
+			}).then(resp => {
-				const currentCartype = storage.get('carType') || '1001'
+				if (resp.code === '0000') {
-				querySysConfig(currentCartype, 'VipDescImageUrl').then(res => {
+					this.priceList = resp.data
-					this.picUrl = JSON.parse(res.data.configJson).url
+					this.checkedId = this.priceList[0].memberId
+					this.order.outTradeNo = this.priceList[0].memberId
+					this.order.money = this.priceList[0].price
+					this.nowPrice = this.priceList[0].price
+					this.priceList.forEach(item => {
+						if (item.subjects.length > 1) {
+							item.all = true
+						}
 					})
-			},
-			getTitle(){
-				const carId=storage.get('carType') || '1001'
-				querySysConfig(carId,'SimplifyQuestionNum').then(resp=>{
-					if(resp.code==='0000'){
-						const list = JSON.parse(resp.data.configJson)
-						this.titleNum=list.find(item=>item.subject==this.subject).num
-					}
-				})
-			},
-		 async handlePay(){
-				if(this.loading){
-					this.loading=false
-					await this.getWXOpenId()
-					new Pay('wechat', this.order);
-					this.loading=true
 				}
-			},
+			})
-			getWXOpenId() {
+		},
-			      const that = this
+		checkPrice(val, price) {
-			      uni.login({
+			this.checkedId = val
-			        success(res) {
+			this.order.outTradeNo = val
-								that.$set(that.order, 'code', res.code);
+			this.nowPrice = price
-			        }
+			this.order.money = price
-			      })
-			    },
-			getVipList(){
-				getVipList({
-					carTypeId: storage.get('carType') || '1001',
-					subject:this.subject
-				}).then(resp=>{
-					if(resp.code==='0000'){
-						this.priceList=resp.data
-						this.checkedId=this.priceList[0].memberId
-						this.order.outTradeNo=this.priceList[0].memberId
-						this.order.money=this.priceList[0].price
-						this.nowPrice=this.priceList[0].price
-						this.priceList.forEach(item=>{
-							if(item.subjects.length>1){
-								item.all=true
-							}
-						})
-					}
-				})
-			},
-			checkPrice(val,price){
-				this.checkedId=val
-				this.order.outTradeNo=val
-				this.nowPrice=price
-				this.order.money=price
-			}
-		}
 		}
+	}
+}
 </script>
 
 <style scoped>
-	.option_tem{
+.option_tem {
-		width: 220rpx;
+	width: 220rpx;
-		height: 241rpx;
+	height: 241rpx;
-		text-align: center;
+	text-align: center;
-		background: #FFFFFF;
+	background: #FFFFFF;
-		border: 2px solid #D8D8D8;
+	border: 2px solid #D8D8D8;
-		border-radius: 16rpx 46rpx 16rpx 16rpx;
+	border-radius: 16rpx 46rpx 16rpx 16rpx;
-		padding: 14px;
+	padding: 14px;
-	}
+}
-	.checked_item{
+
-		background: #FFF0E5;
+.checked_item {
-		border: 4px solid #FF6E02;
+	background: #FFF0E5;
-	}
+	border: 4px solid #FF6E02;
-	.bottom_box{
+}
-		width: 214rpx;
+
-		height: 40rpx;
+.bottom_box {
-		line-height: 40rpx;
+	width: 214rpx;
-		text-align: center;
+	height: 40rpx;
-		background: rgb(239,239,239);
+	line-height: 40rpx;
-		border-radius: 0 0 16rpx 16rpx;
+	text-align: center;
-		position: absolute;
+	background: rgb(239, 239, 239);
-		bottom: 0;
+	border-radius: 0 0 16rpx 16rpx;
-		left: 0;
+	position: absolute;
-	}
+	bottom: 0;
-	.checked_bottom{
+	left: 0;
-		width: 218rpx;
+}
-		border-radius: 0 0 16rpx 5rpx;
+
-		background-color: #FF6E02;
+.checked_bottom {
-		color:#fff
+	width: 218rpx;
-	}
+	border-radius: 0 0 16rpx 5rpx;
-	.tag{
+	background-color: #FF6E02;
-		padding:0 5px;
+	color: #fff
-		height: 36rpx;
+}
-		background: linear-gradient(90deg, #E66501 0%, #F8A42C 100%);
+
-		border-radius: 8rpx 20rpx 8rpx 8rpx;
+.tag {
-		line-height: 36rpx;
+	padding: 0 5px;
-		text-align: center;
+	height: 36rpx;
-		font-size: 12px;
+	background: linear-gradient(90deg, #E66501 0%, #F8A42C 100%);
-		color: #FFFC27;
+	border-radius: 8rpx 20rpx 8rpx 8rpx;
-		position: absolute;
+	line-height: 36rpx;
-		left: 10rpx;
+	text-align: center;
-		top:-18rpx
+	font-size: 12px;
-	}
+	color: #FFFC27;
-	.intr_box{
+	position: absolute;
-		width: 100%;
+	left: 10rpx;
-		text-align: center;
+	top: -18rpx
-		padding: 40rpx;
+}
-		background: #FFF0E5;
+
-		border-radius: 16rpx;
+.intr_box {
-	}
+	width: 100%;
-	.vip_item{
+	text-align: center;
-		width: 208rpx;
+	padding: 40rpx;
-		height: 54rpx;
+	background: #FFF0E5;
-		line-height: 54rpx;
+	border-radius: 16rpx;
-		text-align: center;
+}
-		font-size: 14px;
+
-		background: #F3D7C2;
+.vip_item {
-		border-radius: 0rpx 10rpx 10rpx 10rpx;
+	width: 208rpx;
-	}
+	height: 54rpx;
-	.sub_btn{
+	line-height: 54rpx;
-		width:100%;
+	text-align: center;
-		height: 110rpx;
+	font-size: 14px;
-		border: 4px solid #F59B26;
+	background: #F3D7C2;
-		background: linear-gradient(0deg, #E66501 0%, #F8A42C 100%);
+	border-radius: 0rpx 10rpx 10rpx 10rpx;
-		box-shadow: 0rpx 16rpx 20rpx 1rpx rgba(245,155,38,0.78);
+}
-		border-radius: 55rpx;
+
-		padding: 14rpx;
+.sub_btn {
-	}
+	width: 100%;
-	.contain-box {
+	height: 110rpx;
-		width: 344rpx;
+	border: 4px solid #F59B26;
-		height: 196rpx;
+	background: linear-gradient(0deg, #E66501 0%, #F8A42C 100%);
-		background: #00B74F;
+	box-shadow: 0rpx 16rpx 20rpx 1rpx rgba(245, 155, 38, 0.78);
-		border-radius: 16rpx;
+	border-radius: 55rpx;
-	}
+	padding: 14rpx;
-	
+}
-	.play_btn_2 {
+
-		width: 65rpx;
+.contain-box {
-		height: 65rpx;
+	width: 344rpx;
-		position: absolute;
+	height: 196rpx;
-		left: 165.5rpx;
+	background: #00B74F;
-		top: 78rpx
+	border-radius: 16rpx;
-	}
+}
+
+.play_btn_2 {
+	width: 65rpx;
+	height: 65rpx;
+	position: absolute;
+	left: 165.5rpx;
+	top: 78rpx
+}
 </style>

src/pages/login/login.vue

@@ -13,7 +13,7 @@
       <view class="list-call">
         <u-input class="sl-input" v-model="login.code" type="text" maxlength="6" border="none" placeholder="输入验证码">
           <template #suffix>
-            <text class="fs14 mr10" style="color: #05C341;" @tap="getCode">{{countDown==0?'获取验证码':countDown}}</text>
+            <text class="fs14 mr10" style="color: #05C341;" @tap="getCode">{{ countDown == 0 ? '获取验证码' : countDown }}</text>
           </template>
         </u-input>
       </view>
@@ -27,138 +27,142 @@
 </template>
 
 <script>
-  import {
+import {
-    isPhone
+  isPhone
-  } from '@/jtools/utils/validate.js'
+} from '@/jtools/utils/validate.js'
-  import {
+import {
-    getCode,
+  getCode,
-    login
+  login
-  } from '@/jtools/api/login'
+} from '@/jtools/api/login'
-  import useUserStore from '@/jtools/store/user'
+import useUserStore from '@/jtools/store/user'
-  export default {
+import storage from '@/jtools/storage';
-    data() {
+export default {
-      return {
+  data() {
-        login: {
+    return {
-          phone: '',
+      login: {
-          code: ''
+        phone: '',
-        },
+        code: ''
-        countDown: 0,
+      },
-        js: undefined
+      countDown: 0,
-      };
+      js: undefined
-    },
+    };
-    onShow() {
+  },
-      if(useUserStore().isLogin) {
+  onShow() {
-        this.toHome()
+    if (useUserStore().isLogin) {
-      }
+      this.toHome()
-    },
+    }
-    methods: {
+  },
-      getCode() {
+  methods: {
-        if (isPhone(this.login.phone) && this.countDown == 0) {
+    getCode() {
-          getCode({
+      if (isPhone(this.login.phone) && this.countDown == 0) {
-            phone: this.login.phone
+        getCode({
-          }).then(resp => {
+          phone: this.login.phone
-            // if (resp.code == '0000') {
+        }).then(resp => {
-              uni.showToast({
+          // if (resp.code == '0000') {
-                title: '发送成功!',
+          uni.showToast({
-                icon: 'none'
+            title: '发送成功!',
-              })
+            icon: 'none'
-              this.countDown = 60
-              this.js = setInterval(() => {
-                this.countDown--;
-                if (this.countDown == 0) {
-                  this.clear()
-                }
-              }, 1000)
-            // }
           })
-        }
+          this.countDown = 60
-      },
+          this.js = setInterval(() => {
-      clear() {
+            this.countDown--;
-        clearInterval(js)
+            if (this.countDown == 0) {
-        this.js = null
+              this.clear()
-        this.countDown = 0
-      },
-      bindLogin() {
-        if(isPhone(this.login.phone) && this.login.code) {
-          useUserStore().login(this.login).then(resp => {
-            if(resp.userId) {
-							useUserStore().getUserInfo()
-							useUserStore().searchUserVip()
-              this.toHome()
             }
-          })
+          }, 1000)
-        }
+          // }
-      },
-      toHome() {
-        uni.switchTab({
-          url: '/pages/index/index'
         })
       }
+    },
+    clear() {
+      clearInterval(js)
+      this.js = null
+      this.countDown = 0
+    },
+    bindLogin() {
+      if (isPhone(this.login.phone) && this.login.code) {
+        let params = { ...this.login }
+        if (storage.get('companyId')) {
+          params.id = storage.get('companyId')
+        }
+        useUserStore().login(params).then(resp => {
+          if (resp.userId) {
+            useUserStore().getUserInfo()
+            useUserStore().searchUserVip()
+            this.toHome()
+          }
+        })
+      }
+    },
+    toHome() {
+      uni.switchTab({
+        url: '/pages/index/index'
+      })
     }
   }
+}
 </script>
 
 <style>
-  page {
+page {
-    background-color: #fff;
+  background-color: #fff;
-  }
+}
 
-  .content {
+.content {
-    display: flex;
+  display: flex;
-    flex-direction: column;
+  flex-direction: column;
-    justify-content: center;
+  justify-content: center;
-  }
+}
 
-  .header {
+.header {
-    margin-top: 166rpx;
+  margin-top: 166rpx;
-    margin-left: auto;
+  margin-left: auto;
-    margin-right: auto;
+  margin-right: auto;
-    letter-spacing: 10rpx;
+  letter-spacing: 10rpx;
-  }
+}
 
-  .header image {
+.header image {
-    width: 383rpx;
+  width: 383rpx;
-  }
+}
 
-  .list {
+.list {
-    display: flex;
+  display: flex;
-    flex-direction: column;
+  flex-direction: column;
-    padding-top: 120rpx;
+  padding-top: 120rpx;
-    padding-left: 90rpx;
+  padding-left: 90rpx;
-    padding-right: 90rpx;
+  padding-right: 90rpx;
-  }
+}
 
-  .list-call {
+.list-call {
-    display: flex;
+  display: flex;
-    flex-direction: row;
+  flex-direction: row;
-    justify-content: space-between;
+  justify-content: space-between;
-    align-items: center;
+  align-items: center;
-    height: 100rpx;
+  height: 100rpx;
-    color: #333333;
+  color: #333333;
-    border-bottom: 0.5px solid #e2e2e2;
+  border-bottom: 0.5px solid #e2e2e2;
-  }
+}
 
 
 
-  .list-call .sl-input {
+.list-call .sl-input {
-    flex: 1;
+  flex: 1;
-    text-align: left;
+  text-align: left;
-    font-size: 32rpx;
+  font-size: 32rpx;
-    margin-left: 16rpx;
+  margin-left: 16rpx;
-  }
+}
-
-  .button-login {
-    color: #FFFFFF;
-    font-size: 34rpx;
-    width: 560rpx;
-    height: 100rpx;
-    background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);
-    border-radius: 50rpx;
-    line-height: 100rpx;
-    text-align: center;
-    margin-top: 100rpx;
-    margin-left: auto;
-    margin-right: auto;
-  }
 
+.button-login {
+  color: #FFFFFF;
+  font-size: 34rpx;
+  width: 560rpx;
+  height: 100rpx;
+  background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);
+  border-radius: 50rpx;
+  line-height: 100rpx;
+  text-align: center;
+  margin-top: 100rpx;
+  margin-left: auto;
+  margin-right: auto;
+}
 </style>

src/pages/me/index.vue

@@ -40,7 +40,7 @@
           <view v-if="!isLogin || !vipOn.length" class="text-center">
             <view class="fs18 fwb" style="color: #7E4012FF;">开通VIP尊享以下权益</view>
             <view class="fs15" style="color: #7E4012FF;">精选500题 / 真是模考 / 考前密卷</view>
-            <view class="study fs16 text-center" style="margin: 25px auto 0;color: #F6E99FFF;">立即开通</view>
+            <view class="study fs16 text-center" style="margin: 25px auto 0;color: #F6E99FFF;">{{ isIOS ? 'iOS暂不可用' : '立即开通' }}</view>
           </view>
           <view v-else-if="vipOn.length" class="text-center">
             <view class="fs18 fwb" style="color: #7E4012FF;">{{ vipText }}</view>
@@ -81,11 +81,16 @@
               <img src="/static/image/mine/wdtj.png" style="width: 24px;height: 24px;">
             </template>
           </u-cell>
-        	<u-cell size="large" title="我的题库" :value="carName" isLink @tap="toChangeCarType">
+        	<u-cell size="large" title="我的题库" :value="carName" @tap="toChangeCarType">
             <template #icon>
               <img src="/static/image/mine/wdtk.png" style="width: 24px;height: 24px;">
             </template>
           </u-cell>
+					<u-cell size="large" title="联系我们" @tap="callPhoneNumber">
+					  <template #icon>
+					    <img src="/static/image/mine/callme.png" style="width: 24px;height: 24px;">
+					  </template>
+					</u-cell>
         </u-cell-group>
       </view>
       <view v-if="isLogin" class="flex ai-c jc-c mt12 br8 bc-fff" style="height: 50px;" @tap="handleLogout">
@@ -135,26 +140,37 @@ export default {
       }
     }
   },
- data(){
+  data() {
- 	return{
+    return {
- 		carName:storage.get('carName') || '小车C1/C2/C3'
+      carName: storage.get('carName') || '小车C1/C2/C3',
- 	}
+      isIOS: true
- },
+    }
+  },
   onShow() {
-		this.carName=storage.get('carName') || '小车C1/C2/C3'
+    this.isIOS = this.$platform.device().includes('ios')
+    this.carName = storage.get('carName') || '小车C1/C2/C3'
   },
   methods: {
-		toChangeCarType(){
+		// 拨打电话
-			uni.navigateTo({
+		callPhoneNumber() {
-				url:"/pages/me/changeCarType"
+		  uni.makePhoneCall({
-			})
+		    phoneNumber: '15105693067'
+		  });
 		},
+    toChangeCarType() {
+      uni.navigateTo({
+        url: "/pages/me/changeCarType"
+      })
+    },
     handleVip() {
+      if (this.isIOS) {
+        return
+      }
       if (this.isLogin) {
         // if (this.vipOn.length) {
-          uni.navigateTo({
+        uni.navigateTo({
-            url: '/pages/me/vip'
+          url: '/pages/me/vip'
-          })
+        })
         // } else {
         //   uni.navigateTo({
         //     url: '/pages/index/videoVip'
@@ -192,10 +208,10 @@ export default {
         // uni.navigateTo({
         //   url: '/pages/me/tijian'
         // })
-				uni.showToast({
+        uni.showToast({
-					title:'敬请期待',
+          title: '敬请期待',
-					icon:'none'
+          icon: 'none'
-				})
+        })
       } else {
         this.toLogin()
       }

src/pages/questionBank/components/Question.vue

@@ -7,9 +7,8 @@
 						:class="tCurrent==item.value?'checked':'unchecked'" @tap="sectionChange(item.value)">{{item.label}}</view>
 				</view>
 			</view>
-			<swiper class="swiper mt20" :current="swiperIndex" :duration="duration" :autoplay="false"
+			<swiper class="swiper mt20" :current="swiperIndex" :duration="duration" :autoplay="false" @change="onChange"
-				 @change="onChange" @animationfinish="onAnimationfinish"
+				@animationfinish="onAnimationfinish" @touchend="touchEnd">
-				@touchend="touchEnd">
 				<swiper-item v-for="(quesItem,quesIndex) in swiperList" :key="quesIndex.questionId">
 					<scroll-view scroll-y="true" class="swiper-scroll">
 						<view>
@@ -17,8 +16,10 @@
 								<text class="tag_box">{{getQuestType(quesItem.type)}}</text>
 								<text class="fs18" style="line-height: 42rpx;vertical-align: middle;">{{quesItem.question}}</text>
 							</view>
-							<view class="p14" v-if="quesItem.imageUrl">
+							<view class="p14 flex jc-c ai-c" v-if="quesItem.imageUrl">
-								<image v-show="quesItem.imageUrl" style="width: 100%;height: auto;" mode="widthFix" :lazy-load="true" @load="onoff='1'" :src="quesItem.imageUrl"></image>
+								<image v-show="quesItem.imageUrl" style="width: auto;max-height:40vh;" mode="heightFix"
+									:lazy-load="true" @load="onoff='1'" :src="quesItem.imageUrl" @click="preview(quesItem.imageUrl)">
+								</image>
 							</view>
 							<template v-if="quesItem.type!='3'">
 								<view class="flex m14lr ai-c mt20" v-for="(item,index) in quesItem.optionList" :key="item.op"
@@ -41,7 +42,8 @@
 									v-if="quesItem.clickAnswer&&!quesItem.trueAnswer.includes(quesItem.clickAnswer) || showBestAnswer">
 									<view class="answer_box">
 										<text class="fs18 fw600 cor-000">答案:{{getRightOp(quesItem.trueAnswer)}}</text>
-										<view v-if="showSkillInfo==='show'&&quesItem.skillInfo" class="fs18 cor-000 mt5">答题技巧：{{quesItem.skillInfo}}</view>
+										<view v-if="showSkillInfo==='show'&&quesItem.skillInfo" class="fs18 cor-000 mt5">
+											答题技巧：{{quesItem.skillInfo}}</view>
 									</view>
 									<view class="flex ai-c jc-c mt10">
 										<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
@@ -50,7 +52,10 @@
 									</view>
 									<view class="mt10">
 										<view class="fw600 cor-000 mb10 flex ai-c">
-											<view style="background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);height: 36rpx;width: 8rpx;" class="mr5"></view>题目解析</view>
+											<view
+												style="background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);height: 36rpx;width: 8rpx;"
+												class="mr5"></view>题目解析
+										</view>
 										<view style="text-indent:2em;">{{quesItem.bestAnswer}}</view>
 									</view>
 								</view>
@@ -92,24 +97,29 @@
 								<view class="m14lr mt30" v-if="isShowAnswer">
 									<view class="answer_box">
 										<text class="fs18 fw600 cor-000">答案:{{getRightOp(quesItem.trueAnswer)}}</text>
-										<view v-if="showSkillInfo==='show'&&quesItem.skillInfo" class="fs18 cor-000"> 答题技巧：{{quesItem.skillInfo}}</view>
+										<view v-if="showSkillInfo==='show'&&quesItem.skillInfo" class="fs18 cor-000">
-										</view>
+											答题技巧：{{quesItem.skillInfo}}</view>
-										<view class="flex ai-c jc-c mt10">
+									</view>
-											<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
+									<view class="flex ai-c jc-c mt10">
-											<view class="fs18 fw600 cor-000 p15lr">试题详解</view>
+										<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
-											<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
+										<view class="fs18 fw600 cor-000 p15lr">试题详解</view>
-										</view>
+										<view style="height: 6rpx;width: 120rpx;background-color: rgb(232, 232, 232);"></view>
-										<view class="mt10">
+									</view>
-											<view class="fw600 cor-000 mb10 flex ai-c">
+									<view class="mt10">
-												<view style="background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);height: 36rpx;width: 8rpx;" class="mr5"></view>题目解析</view>
+										<view class="fw600 cor-000 mb10 flex ai-c">
-											<view style="text-indent:2em;">{{quesItem.bestAnswer}}</view>
+											<view
+												style="background: linear-gradient(90deg, #11DF20 0%, #00B74F 100%);height: 36rpx;width: 8rpx;"
+												class="mr5"></view>题目解析
 										</view>
+										<view style="text-indent:2em;">{{quesItem.bestAnswer}}</view>
+									</view>
 								</view>
 							</template>
 						</view>
 					</scroll-view>
 				</swiper-item>
 			</swiper>
+			<q-previewImage ref="previewRef" :urls="imgs" @open="open"></q-previewImage>
 			<view class="wp100 flex jc-sb ai-c p14 bc-fff" v-if="isShowAll" style="position: fixed;bottom: 0;left: 0;">
 				<view style="width: 220rpx;">
 					<view v-if="type==='practice'" style="width: 220rpx;height: 80rpx;"></view>
@@ -125,11 +135,11 @@
 					<text class="cor-666">{{collectList.includes(questionList[topicIndex].questionId)?'已收藏':'收藏'}}</text>
 				</view>
 				<view class="text-center">
-					<view style="color: #00B74F;">{{type=='exam'?rightList.length:storageRightList.length}}</view>
+					<view style="color: #00B74F;">{{navTitle !== '顺序答题'?rightList.length:storageRightList.length}}</view>
 					<text class="cor-666">答对</text>
 				</view>
 				<view class="text-center">
-					<view style="color: #FF6E02;">{{type=='exam'?wrongList.length:storageWrongList.length}}</view>
+					<view style="color: #FF6E02;">{{navTitle !== '顺序答题'?wrongList.length:storageWrongList.length}}</view>
 					<text class="cor-666">答错</text>
 				</view>
 				<view class="text-center" @tap="popupShow=!popupShow">
@@ -217,11 +227,11 @@
 							<text class="cor-666">{{collectList.includes(questionList[topicIndex].questionId)?'已收藏':'收藏'}}</text>
 						</view>
 						<view class="text-center">
-							<view style="color: #00B74F;">{{type=='exam'?rightList.length:storageRightList.length}}</view>
+							<view style="color: #00B74F;">{{navTitle !== '顺序答题'?rightList.length:storageRightList.length}}</view>
 							<text class="cor-666">答对</text>
 						</view>
 						<view class="text-center">
-							<view style="color: #FF6E02;">{{type=='exam'?wrongList.length:storageWrongList.length}}</view>
+							<view style="color: #FF6E02;">{{navTitle !== '顺序答题'?wrongList.length:storageWrongList.length}}</view>
 							<text class="cor-666">答错</text>
 						</view>
 						<view class="text-center" @tap="popupShow=!popupShow">
@@ -232,8 +242,8 @@
 						</view>
 					</view>
 					<view class="flex ai-c jc-fs p14" style="flex-wrap: wrap;max-height: 400px;overflow-y: scroll;">
-						<view v-for="(item,index) of questionList" :key="item.questionId" style="width:20%;position: relative;" class="flex ai-c jc-c"
+						<view v-for="(item,index) of questionList" :key="item.questionId" style="width:20%;position: relative;"
-							@tap="chooseQueston(index)">
+							class="flex ai-c jc-c" @tap="chooseQueston(index)">
 							<view class="tCircle mb10" :class="{
 											'active':index == topicIndex,
 											'success':type=='exam'?rightList.includes(item.questionId):storageRightList.includes(item.questionId),
@@ -241,8 +251,8 @@
 										}">
 								{{index+1}}
 							</view>
-							<u-icon name="star-fill" v-if="collectList.includes(item.questionId)" style="position: absolute;right: 5px;top:-3px"
+							<u-icon name="star-fill" v-if="collectList.includes(item.questionId)"
-								color="rgb(249,236,141)" size="24"></u-icon>
+								style="position: absolute;right: 5px;top:-3px" color="rgb(249,236,141)" size="24"></u-icon>
 						</view>
 					</view>
 				</view>
@@ -313,17 +323,15 @@
 			isShowAll: {
 				type: Boolean,
 				default: true
-			},
+			}
-			subject: {
-				type: [String, Number],
-				default: 1,
-			},
 		},
 		data() {
 			return {
-				showSkillInfo:'hidden',
+				imgs: [],
-				currentType:storage.get('carType') || '1001',
+				subject: '1',
-				onoff:'0',
+				showSkillInfo: 'hidden',
+				currentType: storage.get('carType') || '1001',
+				onoff: '0',
 				navTitle: '',
 				originArray: '',
 				showBestAnswer: false,
@@ -336,7 +344,7 @@
 				tCurrent: 0,
 				index: 0,
 				qIndex: 0,
-				storageRightList:storage.get(`rightList_subject${this.subject}`) || [],
+				storageRightList: storage.get(`rightList_subject${this.subject}`) || [],
 				storageWrongList: storage.get(`wrongList_subject${this.subject}`) || [],
 				rightList: [],
 				wrongList: [],
@@ -351,9 +359,9 @@
 			}
 		},
 		created() {
-			const carType=storage.get('carType') || '1001'
+			const carType = storage.get('carType') || '1001'
-			querySysConfig(carType, 'NeedSkillInfo').then(resp=>{
+			querySysConfig(carType, 'NeedSkillInfo').then(resp => {
-				if(resp.code === '0000'){
+				if (resp.code === '0000') {
 					this.showSkillInfo = resp.data.configValue
 				}
 			})
@@ -380,12 +388,27 @@
 
 			},
 			timeCount() {
-				const time =  45 * 60 * 1000
+				const time = 45 * 60 * 1000
 				return time
 			}
 		},
 		methods: {
 			...mapActions(useQuestionStore, ['getCurrentIndex']),
+			open() {
+
+			},
+			preview(url) {
+				this.imgs = [url] //设置图片数组
+				// #ifdef MP-WEIXIN
+				this.$nextTick(() => {
+					this.imgs = [url]
+					setTimeout(()=>{
+						this.$refs.previewRef.open(url);
+					},500)
+				})
+				// #endif
+
+			},
 			getOriginArr(val) {
 				const arr = JSON.parse(val)
 				let arr1 = []
@@ -539,11 +562,11 @@
 			toSubmit() {
 				const restTime = this.time.hours * 60 * 60 + this.time.minutes * 60 + this.time.seconds
 				const score = (this.rightList.length / this.questionList.length * 100).toFixed(0)
-				if(this.rightList.length+this.wrongList.length==0){
+				if (this.rightList.length + this.wrongList.length == 0) {
 					uni.navigateBack({
-						delta:1
+						delta: 1
 					})
-				}else{
+				} else {
 					submitTest({
 						"carTypeId": storage.get('carType') || '1001',
 						"score": score,
@@ -768,10 +791,17 @@
 				// this.renderSwiper(0)
 				this.$emit('changeTab', index)
 			},
-			getQuestionList(val, title) {
+			getQuestionList(val, title, subject) {
 				if (title) {
 					this.navTitle = title
 				}
+				if (subject) {
+					this.subject = subject
+					console.log(this.subject);
+					this.storageRightList = storage.get(`rightList_subject${subject}`) || []
+					this.storageWrongList = storage.get(`wrongList_subject${subject}`) || []
+					this.collectList = storage.get(`collectList_subject${subject}`) || []
+				}
 				if (val && val.length) {
 					this.questionList = JSON.parse(val)
 				} else {
@@ -779,7 +809,12 @@
 				}
 				console.log(this.questionList);
 				if (this.navTitle === '顺序答题') {
-					this.pickerTopic(this[`currentIndex_subject${this.subject}`])
+					if (subject) {
+						this.pickerTopic(this[`currentIndex_subject${subject}`])
+					} else {
+						this.pickerTopic(this[`currentIndex_subject${this.subject}`])
+					}
+
 				} else {
 					this.pickerTopic(this.topicIndex)
 				}

src/pages/questionBank/practiceExams.vue

@@ -3,8 +3,7 @@
 		<!-- <u-navbar title="模拟考试" @rightClick="rightClick" :autoBack="true">
 		</u-navbar> -->
 		<j-navbar :isDefineBack="true" @toBack="toBack">{{title}}</j-navbar>
-		<Question ref="question" :tabsList="tabsList" v-model:isSubmit="isSubmit" :type="type" :isShowAll="isShowAll"
+		<Question ref="question" :tabsList="tabsList" v-model:isSubmit="isSubmit" :type="type" :isShowAll="isShowAll" @changeTab="changeTab" />
-			:subject="subject" @changeTab="changeTab" />
 	</view>
 </template>
 
@@ -72,7 +71,7 @@
 					}
 				}
 				this.type = 'exam'
-				this.$refs.question.getQuestionList(JSON.stringify(this.questionArr), this.title)
+				this.$refs.question.getQuestionList(JSON.stringify(this.questionArr), this.title,this.subject)
 			}
 		},
 		computed: {

src/pages/questionBank/practiceResult.vue

@@ -6,7 +6,7 @@
 			<GradesChart :titleName="rightPencentDesc" :actualValue="Number(rightPencent)" />
 			<view class="top_box flex jc-c" style="flex-direction: column;">
 				<view class="wp100 text-center" style="margin-top: -80px;">
-					<text v-if="Number(rightPencent)>=90">太棒了！正确率很高了！</text>
+					<text v-if="Number(rightPencent * 100)>=90">太棒了！正确率很高了！</text>
 					<text v-else>继续努力吧，正确率有点低~</text>
 					<view class="flex ai-c jc-c mt10">
 						<view class="text-center wp50" @tap="toQuestionBank">

src/pages/questionBank/questionBank.vue

@@ -77,7 +77,7 @@
 					}
 				} 
 				this.loading = false
-				this.$refs.question.getQuestionList(JSON.stringify(this.questionArr), this.navTitle)
+				this.$refs.question.getQuestionList(JSON.stringify(this.questionArr), this.navTitle , this.subject)
 				this.$refs.question.getOriginArr(JSON.stringify(this.questionArr))
 			}
 		},

src/pages/questionBank/wrongQuestion.vue

@@ -68,7 +68,9 @@
 				<view class="flex ai-c jc-sb mt10" style="flex-wrap: wrap;">
 					<!-- 这个点击效果没加 -->
 					<view v-for="(item,index) of typeList" :key="index" class="category_item p14 flex jc-sb ai-c mb10" @tap="toCategoryQuestion(item)">
-						<text class="cor-000">{{item.categoryName}}</text>
+						<view class="topic_cont_text" style="max-width: 75%;">
+							<text class="cor-000">{{item.categoryName}}</text>
+						</view>
 						<text class="cor-666">{{item.num}}</text>
 					</view>
 				</view>
@@ -139,8 +141,9 @@
 			},
 			toCategoryQuestion(item){
 				const jsonString = JSON.stringify(item.errorQuestionIdList)
+				console.log(item);
 				uni.navigateTo({
-					url: "/pages/questionBank/questionBank?navTitle=" + item.categoryName + "&questionIdList=" + jsonString
+					url: "/pages/questionBank/questionBank?navTitle=" + item.categoryName + "&questionIdList=" + jsonString+"&subject="+this.subject
 				})
 			},
 			toPractice() {
@@ -264,4 +267,18 @@
 		left: 165.5rpx;
 		top: 78rpx
 	}
+	.topic_cont_text {
+		overflow: hidden;
+		word-break: break-all;
+		/* break-all(允许在单词内换行。) */
+		text-overflow: ellipsis;
+		/* 超出部分省略号 */
+		display: -webkit-box;
+		/** 对象作为伸缩盒子模型显示 **/
+		-webkit-box-orient: vertical;
+		/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+		-webkit-line-clamp: 1;
+		/** 显示的行数 **/
+	
+	}
 </style>

src/uni_modules/g-preview-img/changelog.md

@@ -0,0 +1,11 @@
+## 1.0.4（2022-12-07）
+修改：判断在APP端不监听document的滚动
+## 1.0.3（2022-12-05）
+新增：支持视频预览，视频图片混用
+新增：支持预览单张，handlePreviewImg方法直接传入图片或视频地址即可单张预览
+## 1.0.2（2022-12-05）
+ 
+## 1.0.1（2022-12-05）
+文档错误修改
+## 1.0.0（2022-11-29）
+初始化插件

src/uni_modules/g-preview-img/components/g-preview-img/g-preview-img.vue

@@ -0,0 +1,235 @@
+<template>
+  <view class="pos">
+    <uni-transition :mode-class="modeClass" :show="show">
+      <!-- 多张图片预览 -->
+      <view class="content" @tap="closedPreview">
+        <swiper
+          class="swiper"
+          circular
+          :current="curDot"
+          @change="swiperChange"
+          :indicator-dots="false"
+        >
+          <swiper-item v-for="(item, idx) in selfImgList" :key="idx">
+            <movable-area scale-area>
+              <movable-view
+                :scale="!disabledScale"
+                direction="all"
+                scale="true"
+                scale-min="0.5"
+                scale-max="5"
+                :scale-value="1"
+                damping="150"
+                friction="15"
+              >
+                <image v-if="isImg(item)" :src="item" mode="widthFix"></image>
+                <view class="video-preview" v-else>
+                  <video
+                    :autoplay="true"
+                    :src="item"
+                    :enable-progress-gesture="false"
+                    :show-fullscreen-btn="false"
+                  ></video>
+                </view>
+              </movable-view>
+            </movable-area>
+          </swiper-item>
+        </swiper>
+      </view>
+      <!-- 指示器 -->
+      <slot name="indicator" v-if="imgList.length > 1 && !indicatorDotsType">
+        <view class="current-dot">
+          <view class="change-buttom" @tap.stop="previousImg">
+            <uni-icons class="font-white" type="back" size="30"></uni-icons>
+          </view>
+          <view class="font-white cur">
+            {{ curDot + 1 }}/{{ imgList.length }}
+          </view>
+          <view class="change-buttom" @tap.stop="nextImg">
+            <uni-icons class="font-white" type="forward" size="30"></uni-icons>
+          </view>
+        </view>
+      </slot>
+    </uni-transition>
+  </view>
+</template>
+<script>
+export default {
+  props: {
+    // 过渡效果
+    modeClass: {
+      type: Array,
+      default: ['fade', 'zoom-out'],
+    },
+    // 指示器类型 true 圆点 false 数字
+    indicatorDotsType: {
+      type: Boolean,
+      default: true,
+    },
+    // 图片列表
+    imgList: {
+      type: Array,
+      default: () => [],
+    },
+    // 是否禁止放大缩小 禁止后swiper可以滑动切换
+    disabledScale: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      show: false,
+      curDot: 0,
+      selfImgList: [],
+    };
+  },
+
+  computed: {
+    isImg() {
+      return (src) => {
+        return src.indexOf('.mp4') === -1 ? true : false;
+      };
+    },
+  },
+  watch: {
+    //监听打开时阻止下面元素的滚动事件
+    /*  #ifdef APP-PLUS*/
+    show(val) {
+      if (val) {
+        document
+          .getElementsByClassName('pos')[0]
+          .addEventListener('touchmove', function (e) {
+            e.preventDefault();
+          });
+      }
+    },
+    /* #endif */
+    imgList: {
+      handler(val) {
+        if (val.length) {
+          this.selfImgList = val.concat();
+        }
+      },
+    },
+  },
+  methods: {
+    handlePreviewImg(param) {
+      this.show = !this.show;
+      if (typeof param === 'string') {
+        this.selfImgList = [param];
+      } else {
+        if (param) {
+          this.curDot = param;
+        }
+      }
+      this.$emit('preview', this.show);
+    },
+    closedPreview() {
+      this.show = !this.show;
+      this.curDot = 0;
+      this.$emit('preview', this.show);
+    },
+    swiperChange(e) {
+      this.curDot = e.detail.current;
+      this.$emit('changeImg', e.detail.current);
+    },
+    previousImg() {
+      let num = this.imgList.length - 1;
+      if (this.curDot <= 0) {
+        this.curDot = num;
+      } else {
+        this.curDot--;
+      }
+    },
+    nextImg() {
+      let num = this.imgList.length - 1;
+      if (this.curDot >= num) {
+        this.curDot = 0;
+      } else {
+        this.curDot++;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+movable-view {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+}
+
+movable-area {
+  height: 100%;
+  width: 100%;
+  position: fixed;
+  overflow: hidden;
+}
+
+movable-view image {
+  width: 100%;
+}
+.content {
+  height: 100vh;
+  width: 100vw;
+  display: flex;
+  align-items: center;
+  background: #00000076;
+}
+.pos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+}
+.swiper {
+  height: 100%;
+  width: 100%;
+}
+.current-dot {
+  position: absolute;
+  bottom: 10%;
+  left: 25%;
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  .change-buttom {
+    padding: 10rpx;
+    border-radius: 50%;
+    background: #3f3f3f;
+  }
+  .cur {
+    font-size: 20rpx;
+  }
+}
+
+.font-white {
+  color: #fff !important;
+}
+::v-deep {
+  .uni-swiper-dots-horizontal {
+    bottom: 12%;
+  }
+  .uni-swiper-dot {
+    width: 10rpx;
+    height: 10rpx;
+  }
+
+  uni-video {
+    width: 100vw;
+    height: 100vh;
+  }
+}
+.video-preview {
+  position: relative;
+  .video-close {
+    position: absolute;
+    right: 50rpx;
+    top: 50rpx;
+  }
+}
+</style>

src/uni_modules/g-preview-img/package.json

@@ -0,0 +1,84 @@
+{
+  "id": "g-preview-img",
+  "displayName": "g-preview-img一款兼容vue2，vue3的图片预览插件，视频预览，支持单张多张，左右滑动，放大缩小",
+  "version": "1.0.4",
+  "description": "g-preview-img一款兼容vue2，vue3的图片预览插件，视频预览，支持单张多张，左右滑动，放大缩小",
+  "keywords": [
+    "vue2",
+    "vue3",
+    "图片预览",
+    "视频预览"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

src/uni_modules/g-preview-img/readme.md

@@ -0,0 +1,64 @@
+![image](https://deaon-saasvideo.oss-cn-shanghai.aliyuncs.com/11111.gif)
+### 一款兼容vue2，vue3的图片预览插件，视频预览，支持图片视频混用，支持单张多张，左右滑动，放大缩小
+
+### 基础使用方法
+
+```javascript
+    <template>
+    
+        <image v-for="(item,idx) in imgList" :src="item" :key="idx" @tap="handleClick(idx)"></image>
+        <g-preview-img :imgList="imgList" ref="preview"><g-preview-img>
+    </template>
+    
+    <script setup>
+        import { ref } from 'vue'
+        const preview = ref(null)
+        const imgList = ['图片路径1','图片路径2']
+        const handleClick = (idx)=>{
+            // idx为要打开的图片的索引，也可以不传，默认打开第一张
+			// handlePreviewImg的参数支持传入单张图片地址或单个视频地址
+            preview.value.handlePreviewImg(idx)
+        }
+    </script>
+```
+
+| 属性名/事件            | 类型           | 默认值                   | 说明                                                                                                                                                                                                 |
+| ----------------- | ------------ | --------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| modeClass         | Array/String | \['fade', 'zoom-out'] | uni-transition组件过渡效果，可选值见 <https://uniapp.dcloud.net.cn/component/uniui/uni-transition.html#mode-class-%E5%86%85%E7%BD%AE%E8%BF%87%E6%B8%A1%E5%8A%A8%E7%94%BB%E7%B1%BB%E5%9E%8B%E8%AF%B4%E6%98%8E> |
+| indicatorDotsType | Boolean      | false                 | 多张图片的指示器，ture为圆点，false数字，当图片列表只有一张图片时，默认不展示指示器                                                                                                                                                     |
+| imgList           | Array        |                       | 图片列表                                                                                                                                                                                               |
+| disabledScale     | Boolean      | false                 | 是否禁止双指放大缩小                                                                                                                                                            |
+| @preview          | 打开关闭事件       |                       | 接受一个参数，ture为开启，false为关闭                                                                                                                                                                            |
+| @changeImg        | 图片切换的事件      |                       | 参数为当前的图片索引                                                                                                                                                                                         |
+
+#### 插槽，自定义翻页按钮
+
+```js
+
+<g-preview-img :imgList="imgList" ref="preview">
+    <template>
+        <!--你的翻页按钮-->
+        <view @tap.stop="previousImg">上一页</view>
+        <view @tap.stop="nextImg">下一页</view>
+    </template>
+</g-preview-img>
+
+<script>
+    const preview = ref(null)
+    //上一页的方法
+    const previousImg = ()=>{
+        preview.value.previousImg()
+    }
+    //下一页的方法
+    const previousImg = ()=>{
+        preview.value.nextImg()
+    }
+</script>
+```
+
+#### 支持uniapp原生swiper的属性
+
+    插件内部swiper标签上绑定了$attrs,所以在使用时可以传入一些swiper的属性
+    注意：不要传disable-touch这个属性，会有意想不到的错误
+
+**插件bug会及时修复！！**

src/uni_modules/q-previewImage/changelog.md

@@ -0,0 +1,24 @@
+## 1.1.1（2023-08-01）
+优化文档
+## 1.1.0（2023-08-01）
+优化文档
+## 1.0.9（2023-07-10）
+优化文档
+## 1.0.8（2023-06-25）
+优化文档
+## 1.0.7（2023-06-25）
+优化文档
+## 1.0.6（2023-05-26）
+优化文档
+## 1.0.5（2023-05-22）
+优化文档
+## 1.0.4（2023-04-30）
+新增图片放大功能，解决原生组件和tabbar导航栏等无法覆盖的问题
+## 1.0.3（2023-04-28）
+优化文档
+## 1.0.2（2023-04-28）
+优化文档
+## 1.0.1（2023-04-28）
+新增长按事件
+## 1.0.0（2023-04-28）
+插件上线

src/uni_modules/q-previewImage/components/q-previewImage/q-previewImage.vue

@@ -0,0 +1,121 @@
+<template>
+	<view class="previewImage" v-if="show" @tap="close">
+		<view class="page" v-if="urls.length > 0">
+			<text class="text">{{ current + 1 }} / {{ urls.length }}</text>
+		</view>
+		<swiper class="swiper" :current="current" @change="swiperChange"  @touchstart="handleTouchStart" @touchend="handleTouchEnd">
+			<swiper-item v-for="(item, index) in urls" :key="index">
+				<movable-area class="movable-area" scale-area>
+					<movable-view class="movable-view" direction="all" :inertia="true" damping="100" scale="true" scale-min="1" scale-max="4" :scale-value="scale">
+						<scroll-view scroll-y="true" class="uni-scroll-view">
+							<view class="scroll-view"><image :key="index" class="image" :src="item" mode="widthFix" @longpress="onLongpress(item)" /></view>
+						</scroll-view>
+					</movable-view>
+				</movable-area>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		urls: {
+			type: Array,
+			required: true,
+			default: () => {
+				return [];
+			}
+		}
+	},
+	data() {
+		return {
+			show: false,
+			current: 0, //当前页
+			scale: 1,
+			isZooming: false // 是否处于缩放状态
+		};
+	},
+	methods: {
+		//打开
+		open(current) {
+			this.current = this.urls.findIndex(item => item === current);
+			this.show = true;
+			this.$emit('open');
+		},
+		//关闭
+		close() {
+			if (!this.isZooming) {
+				this.show = false;
+				this.current = 0;
+				this.$emit('close');
+			}
+		},
+		//图片改变
+		swiperChange(e) {
+			this.current = e.detail.current;
+		},
+		//监听长按
+		onLongpress(e) {
+			this.$emit('onLongpress', e);
+		},
+		handleTouchStart() {
+			this.isZooming = true;
+		},
+		handleTouchEnd() {
+			this.isZooming = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.previewImage {
+	z-index: 9999;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: #000000;
+	.swiper {
+		width: 100%;
+		height: 100vh;
+		swiper-item {
+			.movable-area {
+				height: 100%;
+				width: 100%;
+				.movable-view {
+					width: 100%;
+					min-height: 100%;
+					.scroll-view {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						height: 100vh;
+						.image {
+							width: 100%;
+							height: auto;
+						}
+					}
+				}
+			}
+		}
+	}
+	.page {
+		position: absolute;
+		z-index: 9999;
+		width: 100%;
+		top: 60rpx;
+		text-align: center;
+		.text {
+			color: #fff;
+			font-size: 32rpx;
+			background-color: rgba(0, 0, 0, 0.5);
+			padding: 3rpx 16rpx;
+			border-radius: 20rpx;
+			user-select: none;
+		}
+	}
+}
+</style>

src/uni_modules/q-previewImage/package.json

@@ -0,0 +1,81 @@
+{
+  "id": "q-previewImage",
+  "displayName": "图片预览、多图左右滑动、图片放大、支持覆盖原生组件、原生导航栏、tabbar",
+  "version": "1.1.1",
+  "description": "最简洁的模拟图片预览,支持长按事件，多图左右滑动，大图上下滑动查看，支持图片放大，支持覆盖原生组件/原生导航栏/tabbar  支持vue2/vue3/app/小程序/h5",
+  "keywords": [
+    "图片预览"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.4.14"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

src/uni_modules/q-previewImage/readme.md

@@ -0,0 +1,244 @@
+# 最简洁的模拟图片预览,支持长按事件，多图左右滑动，大图上下滑动查看，支持图片放大，支持覆盖原生组件/原生导航栏/tabbar  支持vue2/vue3/app/小程序/h5
+
+  - 为了解决项目中因一些特殊原因无法使用uni.previewImage，例如App.onShow或者页面的oShow中写了方法。
+  - 如果用uni.previewImage，每次预览图片都会进到onShow的方法里
+  - 可以基本实现官方的预览图片功能，但是体验不如uni.previewImage()
+  - 如没有特殊原因，还是推荐官方的uni.previewImage()
+
+## 安装指引
+
+##1. 在插件市场打开本插件页面，在右侧点击`使用 HBuilderX 导入插件`，选择要导入的项目点击确定
+
+##2. 使用方法 vue2写法
+
+```
+<template>
+	<view>
+		<video v-if="videoShow" id="myVideo" src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/%E7%AC%AC1%E8%AE%B2%EF%BC%88uni-app%E4%BA%A7%E5%93%81%E4%BB%8B%E7%BB%8D%EF%BC%89-%20DCloud%E5%AE%98%E6%96%B9%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B@20200317.mp4" controls></video>
+		<image v-for="(item, index) in imgs" :key="index" :src="item" @click="preview(item)"></image>
+		<q-previewImage ref="previewImage" :urls="imgs" @onLongpress="onLongpress" @open="open" @close="close"></q-previewImage>
+	</view>
+</template>
+
+<script>
+export default {
+ 	data() {
+ 		return {
+			videoShow:true,//video组件是否显示
+ 			imgs: [],
+ 		};
+ 	},
+
+ 	methods: {
+ 		preview(url) {
+			this.imgs = ['https://web-assets.dcloud.net.cn/unidoc/zh/multiport-20210812.png', 'https://web-assets.dcloud.net.cn/unidoc/zh/uni-function-diagram.png'] //设置图片数组
+			// #ifdef MP-WEIXIN
+			this.$nextTick(()=>{
+				 this.$refs.previewImage.open(url); // 传入当前选中的图片地址(小程序必须添加$nextTick，解决组件首次加载无图)
+			})
+			// #endif
+			
+			// #ifndef MP-WEIXIN
+			this.$refs.previewImage.open(url); // 传入当前选中的图片地址
+			// #endif
+ 		},
+		onLongpress(e){ //长按事件
+			console.log('当前长按的图片是' + e);
+			uni.showActionSheet({
+				itemList: ['转发给朋友', '保存到手机'],
+				success: function (res) {
+					console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+				},
+				fail: function (res) {
+					console.log(res.errMsg);
+				}
+			});
+		},
+		
+		/* open和close方法一般用不到，但是在一些特殊场景会用到，
+		 * 比如预览图片时你需要覆盖 NavigationBar和 TabBar，
+		 * 或者在app中需要预览图片时覆盖住原生组件，比如video或者map等，
+		 * 你可以根据open和close去做一些操作，例如隐藏导航栏或者隐藏一些原生组件等
+		 */
+		open(){ //监听组件显示 （隐藏TabBar和NavigationBar，隐藏video原生组件）
+			// uni.hideTabBar()
+			// uni.setNavigationBarColor({
+			//   frontColor: '#000000', // 设置前景色为黑色
+			//   backgroundColor: '#000000', // 设置背景色为黑色
+			// })
+			// this.videoShow = false 
+		},
+		close(){ //监听组件隐藏 （显示TabBar和NavigationBar，显示video原生组件）
+			// uni.showTabBar()
+			// uni.setNavigationBarColor({
+			//   frontColor: '#ffffff', // 设置前景色为白色
+			//   backgroundColor: '#000000', // 设置背景色为黑色
+			// })
+			// this.videoShow = true
+		}
+ 	}
+ };
+</script>
+
+
+```
+
+##3. vue3 setup写法
+
+```
+
+<template>
+	<view>
+		<video v-if="videoShow" id="myVideo" src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/%E7%AC%AC1%E8%AE%B2%EF%BC%88uni-app%E4%BA%A7%E5%93%81%E4%BB%8B%E7%BB%8D%EF%BC%89-%20DCloud%E5%AE%98%E6%96%B9%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B@20200317.mp4" controls></video>
+		<image v-for="(item, index) in imgs" :key="index" :src="item" @click="preview(item)"></image>
+		<q-previewImage ref="previewImage" :urls="imgs"  @onLongpress="onLongpress" @open="open" @close="close"></q-previewImage>
+	</view>
+</template>
+
+<script setup>
+import { reactive, ref, toRefs,nextTick } from 'vue';
+
+const data = reactive({
+	videoShow:true,//video组件是否显示
+	imgs: [],
+});
+const previewImage = ref(null);
+
+const { imgs,videoShow } = toRefs(data)// 解构
+
+const preview = url => {
+	data.imgs = ['https://web-assets.dcloud.net.cn/unidoc/zh/multiport-20210812.png', 'https://web-assets.dcloud.net.cn/unidoc/zh/uni-function-diagram.png'] //设置图片数组
+	
+	
+	// #ifdef MP-WEIXIN
+	nextTick(()=>{
+		 previewImage.value.open(url); // 传入当前选中的图片地址(小程序必须添加nextTick，解决组件首次加载无图)
+	})
+	// #endif
+	
+	// #ifndef MP-WEIXIN
+	previewImage.value.open(url); // 传入当前选中的图片地址
+	// #endif
+};
+
+const onLongpress = e =>{
+	console.log('当前长按的图片是' + e);
+	uni.showActionSheet({
+		itemList: ['转发给朋友', '保存到手机'],
+		success: function (res) {
+			console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+		},
+		fail: function (res) {
+			console.log(res.errMsg);
+		}
+	});
+}
+
+/* open和close方法一般用不到，但是在一些特殊场景会用到，
+* 比如预览图片时你需要覆盖 NavigationBar和 TabBar，
+* 或者在app中需要预览图片时覆盖住原生组件，比如video或者map等，
+* 你可以根据open和close去做一些操作，例如隐藏导航栏或者隐藏一些原生组件等
+*/
+const open = () => { //监听组件显示 （隐藏TabBar和NavigationBar，隐藏video原生组件）
+	// uni.hideTabBar()
+	// uni.setNavigationBarColor({
+	// 	frontColor: '#000000', // 设置前景色为黑色
+	// 	backgroundColor: '#000000', // 设置背景色为黑色
+	// })
+	// data.videoShow = false 
+}
+
+const close = () => { //监听组件隐藏 （显示TabBar和NavigationBar，显示video原生组件）
+	// uni.showTabBar()
+	// uni.setNavigationBarColor({
+	// 	frontColor: '#ffffff', // 设置前景色为白色
+	// 	backgroundColor: '#000000', // 设置背景色为黑色
+	// })
+	// data.videoShow = true
+}
+
+</script>
+					
+```
+
+##4. 项目示例 (一般返回的数据图片是以逗号或特殊字符分割的字符串，点击时就需要传两个参数，一个是图片数组，一个是当前图片的index)
+## 注意q-previewImage不要写在循环体中，imgs其实就是用来存放当前图片的数组，每次点击每次赋值就行
+
+```
+<template>
+	<view>
+		<video v-if="videoShow" id="myVideo" src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/%E7%AC%AC1%E8%AE%B2%EF%BC%88uni-app%E4%BA%A7%E5%93%81%E4%BB%8B%E7%BB%8D%EF%BC%89-%20DCloud%E5%AE%98%E6%96%B9%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B@20200317.mp4" controls></video>
+		<view v-for="(item, index) in list" :key="index" class="list">
+			<image :src="i"  mode="aspectFill" v-for="(i,imgindex) in item.urls.split(',')" @click.stop="preimg(item.urls.split(','),imgindex)"></image>
+		<view>
+		<q-previewImage ref="previewImage" :urls="imgs" @onLongpress="onLongpress" @open="open" @close="close"></q-previewImage>
+	</view>
+</template>
+
+<script>
+export default {
+ 	data() {
+ 		return {
+			videoShow:true,//是否显示video组件
+ 			imgs: [],//imgs其实就是用来存放当前图片的数组，每次点击每次赋值就行
+			
+ 		};
+ 	},
+
+ 	methods: {
+ 		preimg(urls,index){
+ 			this.imgs = urls //imgs其实就是用来存放当前图片的数组，每次点击每次赋值就行
+			// #ifdef MP-WEIXIN
+			this.$nextTick(()=>{
+				 this.$refs.previewImage.open(this.imgs[index]); // 传入当前选中的图片地址(小程序必须添加$nextTick，解决组件首次加载无图)
+			})
+			// #endif
+			
+			// #ifndef MP-WEIXIN
+			this.$refs.previewImage.open(this.imgs[index]); // 传入当前选中的图片地址
+			// #endif
+ 		},
+		onLongpress(e){ //长按事件
+			console.log('当前长按的图片是' + e);
+			uni.showActionSheet({
+				itemList: ['转发给朋友', '保存到手机'],
+				success: function (res) {
+					console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+				},
+				fail: function (res) {
+					console.log(res.errMsg);
+				}
+			});
+		},
+		/* open和close方法一般用不到，但是在一些特殊场景会用到，
+		 * 比如预览图片时你需要覆盖 NavigationBar和 TabBar，
+		 * 或者在app中需要预览图片时覆盖住原生组件，比如video或者map等，
+		 * 你可以根据open和close去做一些操作，例如隐藏导航栏或者隐藏一些原生组件等
+		 */
+		open(){ //监听组件显示 （隐藏TabBar和NavigationBar，隐藏video原生组件）
+			// uni.hideTabBar()
+			// uni.setNavigationBarColor({
+			//   frontColor: '#000000', // 设置前景色为黑色
+			//   backgroundColor: '#000000', // 设置背景色为黑色
+			// })
+			// this.videoShow = false 
+		},
+		close(){ //监听组件隐藏 （显示TabBar和NavigationBar，显示video原生组件）
+			// uni.showTabBar()
+			// uni.setNavigationBarColor({
+			//   frontColor: '#ffffff', // 设置前景色为白色
+			//   backgroundColor: '#000000', // 设置背景色为黑色
+			// })
+			// this.videoShow = true
+		}
+ 	}
+ };
+</script>
+
+```
+
+
+## 如果插件对您有一点帮助，请给个五星好评，感谢支持
+
+
+## 如有问题，请加qq 965969604