Merge branch 'yaleji' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into yaleji

project.config.json

@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/pages/project/detail/index.js

@@ -841,20 +841,20 @@ export default class Index extends Component {
     return (
       <View className='bt-nav flex-h'>
         <View className="NewLeft">
-          <Button class='bt-nav__item' style={{ display: posterShow }} onClick={() => { this.togglePosterStatus(true) }}>
+          <View class='bt-nav__item' style={{ display: posterShow }} onClick={() => { this.togglePosterStatus(true) }}>
             <Image src={require('@/assets/img/icon11.png')} className='poster-img'></Image>
             <Text className="text">海报</Text>
-          </Button>
-          <Button class='bt-nav__item' open-type="share" style={{marginLeft: posterShow !== 'none' ? `0` : `15px`}}>
+          </View>
+          <View class='bt-nav__item' open-type="share" style={{marginLeft: posterShow !== 'none' ? `0` : `15px`}}>
             <Image src={require('@/assets/img/icon10.png')} className='fenxiang-img'></Image>
             <Text className="text">分享</Text>
-          </Button>
+          </View>
           {
             personType !== ROLE_CODE['CONSULTANT'] && (
-              <Button className='bt-nav__item' onClick={this.toRecomonedPage}>
+              <View className='bt-nav__item' onClick={this.toRecomonedPage}>
                 <Image src={require('@/assets/img/icon12.png')} className='kehutuijian-img'></Image>
                 <Text className="text">推荐客户</Text>
-              </Button>
+              </View>
             )
           }
         </View>

src/pages/project/detail/index.scss

@@ -13,7 +13,7 @@
   font-size: 0;
   white-space: nowrap;
   text-align: center;
-  > button {
+  > view {
     display: inline-block;
     vertical-align: middle;
     margin-left: 20px;

src/pages/shop/index.js

@@ -450,7 +450,7 @@ export default class Shop extends Component {
                             <View>
                               <View onClick={this.onViewDetail.bind(this, item)}>
                                 <View className='Img'>
-                                  <Image mode='widthFix' className='centerLabel' src={item.imgUrl} />
+                                  <Image mode='aspectFill' className='centerLabel' src={item.imgUrl} />
                                 </View>
                                 <View className='Title'>
                                   <Text>{item.goodsName}</Text>

src/pages/shop/index.scss

@@ -233,6 +233,10 @@
             position: relative;
             overflow: hidden;
             background: #f8f8f8;
+            > image {
+              width: 100%;
+              height: 100%;
+            }
           }
           > .Title {
             padding: 0 20px;