Merge branch 'sit-Carl' into sit-Leung

# Conflicts:
#	rc-busness/pages/index.vue

rc-busness/assets/css/global.less

@@ -150,11 +150,9 @@ img, picture {
 		flex-wrap: nowrap;
 		text-align: center;
 		width: 86%;
-		&::-webkit-scrollbar{
-			display:none;
-		}
 		li{
 			border-radius: 100px;
+			flex-shrink:0;
 		}
 	}
 	.active{
@@ -344,6 +342,9 @@ img, picture {
 				font-size:.75rem;
 				line-height: 1.375rem;
 			}
+			&::-webkit-scrollbar{
+				display:none;
+			}
 		}
 	}
 	
@@ -384,7 +385,7 @@ img, picture {
 			}
 		}
 		img{
-			width:20rem;
+			width:100%;
 			max-width:320px;
 			min-width:160px;
 		}
@@ -496,12 +497,30 @@ img, picture {
 		{
 			li
 			{
-				margin-left: 40px;
+				margin-left: 30px;
 				width: 8.125rem;
 				height: 2.5rem;
 				line-height: 40px;
 				font-size: .875rem;
 			}
+			/*
+			&::-webkit-scrollbar{
+				background:unset;
+				height:4px;
+			}
+			&::-webkit-scrollbar-thumb{
+				background-color:#d7d7d7;
+				height:2px;
+			}
+			&::-webkit-scrollbar-track{
+				background-color:ddd;
+				
+				height:2px;
+			}
+			&::-webkit-scrollbar-button{
+				background:unset;
+			}
+			*/
 		}
 	}
 

rc-busness/assets/css/index.less

@@ -125,7 +125,6 @@
 		height: 26.31rem;
 		width: 100%;
 		font-size: 0.20px;
-		line-height: 1.50rem;
 		text-align: center;
 		position: relative;
 	}
@@ -338,7 +337,6 @@ object-fit: cover;
   height: 100%;
   width: 100%;
   font-size: 1.25rem;
-  line-height: 9.375rem;
   text-align: center;
 
 
@@ -528,7 +526,6 @@ img{
 				cursor: pointer;
 				font-size: 16px;
 				text-align: center;
-				margin-left:1.3vw;
 			}
 		}
 

rc-busness/nuxt.config.js

@@ -50,7 +50,6 @@ export default {
   plugins: [
     '@/plugins/vant',
     '@/plugins/ElementUI',
-    { src: "~/plugins/swiper.js", ssr: false },
     { src: '@/plugins/localStorage', ssr: false },
 
     

rc-busness/package.json

@@ -16,12 +16,10 @@
   },
   "dependencies": {
     "@nuxtjs/axios": "^5.13.6",
-    "@vant/touch-emulator": "^1.3.2",
     "amfe-flexible": "^2.2.1",
     "core-js": "^3.15.1",
     "element-ui": "^2.15.6",
     "ip": "^1.1.5",
-    "jquery": "^3.6.0",
     "less": "^4.1.2",
     "less-loader": "^6.0.0",
     "nuxt": "^2.15.7",
@@ -29,7 +27,8 @@
     "qrcodejs2": "^0.0.2",
     "vant": "^2.12.22",
     "vue-awesome-swiper": "^4.1.1",
-    "vuex-persistedstate": "^4.1.0"
+    "vuex-persistedstate": "^4.1.0",
+	"swiper":"^5.4.5"
   },
   "devDependencies": {
     "@vant/area-data": "^1.1.5",

rc-busness/pages/productdetails/producted.vue

@@ -7,9 +7,6 @@
      <div class="online" id="fixed-catbar-seperator"></div>
 	<div class="rc-top"></div>
     <div class="rc-usermain ts-product-detail rc-max-width--xl rc-layout-container rc-two-column rc-border-bottom rc-border-colour--brand4">
-	<!--
-    <magnifier v-bind:parentmsg="msg" ></magnifier>
-	-->
 	<div class="rc-column">
 		<div data-js-carousel="" data-image-gallery="true">
 		  <div class="rc-carousel rc-carousel__gallery-image" data-zoom-container="328b2e5f-6904-4cac-9709-51ed18d2500f" data-zoom-factor="2">
@@ -223,7 +220,6 @@
 
 <script>
 import Myheader from "~/components/header.vue";
-import magnifier from "@/components/magnifier.vue";
 import tabs from "@/components/tabs.vue";
   import unlogin from "~/components/unlogin.vue";
 import { mapMutations } from "vuex";
@@ -320,7 +316,6 @@ export default {
    components: {
     Myheader,
      tabs,
-     magnifier,
      unlogin,
     Myfooter
 

rc-busness/plugins/swiper.js

@@ -1,4 +0,0 @@
-import Vue from 'vue'
-import VueAwesomeSwiper from 'vue-awesome-swiper'
- 
-Vue.use(VueAwesomeSwiper)