Merge remote-tracking branch 'origin/yijia' into yijia

一家
--- a/addons/unishop/uniapp/uni-shop/pages/product/product.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/product/product.vue
@@ -4,7 +4,7 @@
 			<swiper indicator-dots circular=true duration="400">
 				<swiper-item class="swiper-item" v-for="(item,index) in product.images_text" :key="index">
 					<view class="image-wrapper">
 						<image :src="item" class="loaded" @click="previewImage(index)" mode="aspectFill"></image>
 						<image :src="item" class="loaded" @click="previewImage(index)" mode="heightFix"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -506,6 +506,7 @@
 		.image-wrapper {
 			width: 100%;
 			height: 100%;
 			text-align: center;
 		}

 		.swiper-item {
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.ce279a02.js></script><script src=/h5/static/js/index.0842c0f2.js></script></body></html>
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.ce279a02.js></script><script src=/h5/static/js/index.dfd6cbe6.js></script></body></html>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.dfd6cbe6.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.dfd6cbe6.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.0b064e3d.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.0b064e3d.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.4b7092ec.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.4b7092ec.js
Auteur	SHA1	Message	Date
xubinxcode	a9205c04f5	Merge remote-tracking branch 'origin/yijia' into yijia	il y a 2 ans
xubinxcode	4d0712d0b5	一家	il y a 2 ans