From c8aa3e1c7a335b6fe11439d9cd66d376d47f9428 Mon Sep 17 00:00:00 2001
From: Maoqiang Zheng <soymikey@163.com>
Date: Fri, 8 Mar 2019 14:38:48 +0800
Subject: [PATCH] alipay style config 1.0.1

---
 .../filteredShopComponent.js                  | 61 ++++++++++---------
 .../filteredShopComponent.scss                | 15 +++++
 src/pages/allDemanding/allDemanding.js        | 32 ++++++----
 src/pages/allDemanding/allDemanding.scss      |  4 +-
 src/pages/grabOrderPage/grabOrderPage.js      |  4 +-
 .../renderingView/renderingView.js            | 10 +--
 src/pages/home/home.js                        |  1 +
 src/pages/home/home.scss                      |  5 +-
 .../home/mainCateSlider/mainCateSlider.js     |  2 +-
 src/pages/login/login.js                      |  5 +-
 src/pages/login/login.scss                    |  9 ++-
 src/pages/myNeeds/myNeeds.js                  | 31 +++++-----
 src/pages/myNeeds/myNeeds.scss                |  2 +-
 src/pages/mySupplyDemand/mySupplyDemand.js    | 33 +++++-----
 src/pages/mySupplyDemand/mySupplyDemand.scss  |  2 +-
 src/pages/shop/shop.js                        |  6 +-
 src/pages/shop/shop.scss                      |  7 +--
 src/util/onClickValueService.js               |  3 +
 18 files changed, 136 insertions(+), 96 deletions(-)

diff --git a/src/component/filteredShopComponent/filteredShopComponent.js b/src/component/filteredShopComponent/filteredShopComponent.js
index 0926a7d..c503276 100644
--- a/src/component/filteredShopComponent/filteredShopComponent.js
+++ b/src/component/filteredShopComponent/filteredShopComponent.js
@@ -42,7 +42,7 @@ class recommondShop extends Component {
         }
     }
     goToShop(e) {
-      
+
         const value = onClickValueService(e)
         Taro.navigateTo({
             url: '/pages/shop/shop?id=' + value.shop_id
@@ -117,7 +117,7 @@ class recommondShop extends Component {
             }
         })
             .then(res => {
-                this.setState({ consultTip: res.data.tips,isCanConsult:res.data.canConsult })
+                this.setState({ consultTip: res.data.tips, isCanConsult: res.data.canConsult })
                 console.log('咨询请求', res)
             })
     }
@@ -195,7 +195,7 @@ class recommondShop extends Component {
             this.setState({ isOpenConsult: false })
             this.buyConsult({})
         }
-        
+
 
     }
     handleInputCsultName(e) {
@@ -246,8 +246,8 @@ class recommondShop extends Component {
         const goodsElementsArray = goods !== null ? slicedGoods.map((item, index) => {
             return <View className='goods-img-box' key={index}>
                 <Image className='goods-img' onClick={this.goToShop.bind(this, this.props.shop)}
-                  mode='aspectFit' style='max-height: 100%; max-width: 100%;'
-                  src={URL.Base + item.goods_url}
+                    mode='aspectFit' style='max-height: 100%; max-width: 100%;'
+                    src={URL.Base + item.goods_url}
                 />
             </View>
         }) : null
@@ -260,34 +260,39 @@ class recommondShop extends Component {
                 <AtNoticebar >
                     <Text >提示:{this.state.consultTip}</Text>
                 </AtNoticebar>
-                <View className='input-box' style='display:flex; align-items:center; font-size:28rpx; margin:2% 2%'>
-                    <View className='title'>
+                <View className='input-box' >
+                    <View className='title' >
                         <Text>联系人：</Text>
                     </View>
+                    <View className='value'>
                     <Input name='value'
-                      type='text'
-                      value={this.state.userName}
-                      placeholder='请输入联系人'
-                      onInput={this.handleInputCsultName.bind(this)}
+                        type='text'
+                        value={this.state.userName}
+                        placeholder='请输入联系人'
+                        onInput={this.handleInputCsultName.bind(this)}
                     />
+                    </View>
+                    
 
                 </View>
-                <View className='input-box' style='display:flex; align-items:center; font-size:28rpx; margin-left:2%'>
+                <View className='input-box'>
                     <View className='title'>
                         <Text>联系电话：</Text>
                     </View>
+                    <View className='value'>
                     <Input name='value'
-                      type='number'
-                      maxLength='11'
-                      value={this.state.userPhone}
-                      placeholder='请输入联系电话'
-                      onInput={this.handleInputCsultPhone.bind(this)}
+                        type='number'
+                        maxLength='11'
+                        value={this.state.userPhone}
+                        placeholder='请输入联系电话'
+                        onInput={this.handleInputCsultPhone.bind(this)}
                     />
+                    </View>
                 </View>
             </AtModalContent>
             <AtModalAction>
                 <Button onClick={this.consultModalClose.bind(this)} >取消</Button>
-                <Button  disabled={!this.state.isCanConsult} className={!this.state.isCanConsult?'confirm_button blur':'confirm_button'} onClick={this.consultModalConfirm.bind(this)}>确定</Button>
+                <Button disabled={!this.state.isCanConsult} className={!this.state.isCanConsult ? 'confirm_button blur' : 'confirm_button'} onClick={this.consultModalConfirm.bind(this)}>确定</Button>
             </AtModalAction>
         </AtModal>
 
@@ -297,16 +302,16 @@ class recommondShop extends Component {
             <View className='shop-list-box' >
                 {consultModalElement}
                 <VoucherPosterComponent
-                  name={this.state.userName}
-                  phone={this.state.userPhone}
-                  shopId={this.props.shop.shop_id}
-                  isCanVoucher={this.state.isCanVoucher}
-                  isVoucherPoster={this.state.isOpenVoucher}
-                  onPassDataToChild={this.getDataFromChild.bind(this)}
-                  voucherLeft={this.props.shop.left_nums}
-                  voucherResponseMsg={this.state.voucherResponseMsg}
-                  categoryLevel={this.props.categoryLevel}
-                  classId={this.props.classId === '-1' ? '' : this.props.classId}
+                    name={this.state.userName}
+                    phone={this.state.userPhone}
+                    shopId={this.props.shop.shop_id}
+                    isCanVoucher={this.state.isCanVoucher}
+                    isVoucherPoster={this.state.isOpenVoucher}
+                    onPassDataToChild={this.getDataFromChild.bind(this)}
+                    voucherLeft={this.props.shop.left_nums}
+                    voucherResponseMsg={this.state.voucherResponseMsg}
+                    categoryLevel={this.props.categoryLevel}
+                    classId={this.props.classId === '-1' ? '' : this.props.classId}
                 ></VoucherPosterComponent>
                 <View className='header'>
 
diff --git a/src/component/filteredShopComponent/filteredShopComponent.scss b/src/component/filteredShopComponent/filteredShopComponent.scss
index 049d1f2..bc4eb73 100644
--- a/src/component/filteredShopComponent/filteredShopComponent.scss
+++ b/src/component/filteredShopComponent/filteredShopComponent.scss
@@ -5,6 +5,7 @@ $linearBlue:linear-gradient(to right, #337ab7, #337ab7);
     border-radius: 3px;
     box-shadow: 0 5px 5px #ddd;
     margin-bottom: 10px;
+   
     .confirm_button{
         color:#FF7142!important
     }
@@ -73,6 +74,7 @@ $linearBlue:linear-gradient(to right, #337ab7, #337ab7);
             margin-bottom:2%;
             padding:0;
         }
+        
         .button-container{
             flex:1;
             //margin-top: 20px ;
@@ -170,4 +172,17 @@ $linearBlue:linear-gradient(to right, #337ab7, #337ab7);
 .at-noticebar {
     color:red;
 
+}
+.input-box{
+    display:flex;
+    align-items:center;
+    font-size:28px;
+    margin:2% 2%;
+   .title{
+    flex:1;
+    padding: 10px
+   }
+   .value{
+    flex:2
+   }
 }
\ No newline at end of file
diff --git a/src/pages/allDemanding/allDemanding.js b/src/pages/allDemanding/allDemanding.js
index 3fca8e7..472881a 100644
--- a/src/pages/allDemanding/allDemanding.js
+++ b/src/pages/allDemanding/allDemanding.js
@@ -94,7 +94,7 @@ class AllDemanding extends Component {
                     }
                 } else if (res.data.err_code === 88888) {
                     loginExpired(res)
-                }else {
+                } else {
                     Taro.showToast({
                         title: res.data.err_msg,
                         icon: 'none',
@@ -329,20 +329,26 @@ class AllDemanding extends Component {
                 {/* 开始和结束日期选择 */}
                 <View className='page-section'>
                     <View className='picker-box'>
-                        <Picker mode='date' className='picker-container' style=' width: 56px' onChange={this.onStartDateChange}>
-                            <View className='picker'>
-                                <View className='title-box'>
-                                    <Text className='title'>开始日期:</Text> <Text className='date'>{this.state.startDateSel}</Text>
+                        <View className='picker-wrapper'>
+                            <Picker mode='date' className='picker-container' onChange={this.onStartDateChange}>
+                                <View className='picker'>
+                                    <View className='title-box'>
+                                        <Text className='title'>开始日期:</Text> <Text className='date'>{this.state.startDateSel}</Text>
+                                    </View>
                                 </View>
-                            </View>
-                        </Picker>
-                        <Picker className='picker-container' mode='date' start={this.state.startDateSel} onChange={this.onEndDateChange}>
-                            <View className='picker'>
-                                <View className='title-box'>
-                                    <Text className='title'>结束日期:</Text> <Text className='date'>{this.state.endDateSel}</Text>
+                            </Picker>
+                        </View>
+
+                        <View className='picker-wrapper'>
+                            <Picker className='picker-container' mode='date' start={this.state.startDateSel} onChange={this.onEndDateChange}>
+                                <View className='picker'>
+                                    <View className='title-box'>
+                                        <Text className='title'>结束日期:</Text> <Text className='date'>{this.state.endDateSel}</Text>
+                                    </View>
                                 </View>
-                            </View>
-                        </Picker>
+                            </Picker>
+                        </View>
+
                     </View>
                 </View>
                 {/* 行业分类选择 */}
diff --git a/src/pages/allDemanding/allDemanding.scss b/src/pages/allDemanding/allDemanding.scss
index f7b561e..0538ca9 100644
--- a/src/pages/allDemanding/allDemanding.scss
+++ b/src/pages/allDemanding/allDemanding.scss
@@ -53,8 +53,8 @@ $themeColor: #FF7142;
     display: flex;
     flex-wrap: nowrap;
     flex-direction: row;
-    .picker-container{
-       width: 56px
+    .picker-wrapper{
+       flex:1 ;
     }
 }
 .button-box{
diff --git a/src/pages/grabOrderPage/grabOrderPage.js b/src/pages/grabOrderPage/grabOrderPage.js
index 8ab418c..03c2288 100644
--- a/src/pages/grabOrderPage/grabOrderPage.js
+++ b/src/pages/grabOrderPage/grabOrderPage.js
@@ -313,9 +313,7 @@ class GrabOrderPage extends Component {
         </AtModal>
         const imageElementArray = this.state.images.map((item, index) => {
             return <View className='image-wrapper' key={index}>
-
                 <Image mode='aspectFit' src={URL.Base + item.file_path} style='max-width:100%; max-height:100%;' />
-
             </View>
         })
 
@@ -325,7 +323,7 @@ class GrabOrderPage extends Component {
                 {modalMessageGrabElement}
                 {deleteModalWindowElement}
                 {this.state.isShowRendering ? <RenderingView rendering={this.state.renderingImage}></RenderingView> : null}
-                {this.state.stateId === '3' && !this.state.isShowRendering ? <View className='button-box show-image-button'><View className='button' onClick={this.showImageButton.bind(this)}>
+                {this.state.stateId === '3' && !this.state.isShowRendering&&this.state.renderingImage.length ? <View className='button-box show-image-button'><View className='button' onClick={this.showImageButton.bind(this)}>
                     <Button className='button-orange'>查看效果图</Button>
                 </View></View> : null}
                 <View className='type box'>
diff --git a/src/pages/grabOrderPage/renderingView/renderingView.js b/src/pages/grabOrderPage/renderingView/renderingView.js
index 8321488..c304ba0 100644
--- a/src/pages/grabOrderPage/renderingView/renderingView.js
+++ b/src/pages/grabOrderPage/renderingView/renderingView.js
@@ -20,7 +20,7 @@ class RenderingView extends Component {
         super(props)
         this.state = {
             image: '',
-            isOpened:false
+            isOpened: false
         }
 
     }
@@ -29,12 +29,12 @@ class RenderingView extends Component {
         const item = onClickValueService(e)
         this.setState({
             image: URL.Base + item.file_path,
-            isOpened:true
+            isOpened: true
         })
     }
-    onCloseCurtain(){
+    onCloseCurtain() {
         this.setState({
-            isOpened:false
+            isOpened: false
         })
     }
     componentDidMount() {
@@ -69,7 +69,7 @@ class RenderingView extends Component {
         </AtCurtain>
         return (
             <View className='rendering-container'>
-            {curtainElement}
+                {curtainElement}
                 {renderingElementArray}
             </View>
         )
diff --git a/src/pages/home/home.js b/src/pages/home/home.js
index c0f049b..8faa131 100644
--- a/src/pages/home/home.js
+++ b/src/pages/home/home.js
@@ -216,6 +216,7 @@ class Home extends Component {
   // 点击大类icon
   onClickParentCate(e) {
     const item = onClickValueService(e)
+    
     Taro.showLoading({
       title: '加载中'
     })
diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss
index 9392169..8e45b25 100644
--- a/src/pages/home/home.scss
+++ b/src/pages/home/home.scss
@@ -32,7 +32,7 @@ $themeColor: #FF7142;
     //margin-top: 30px;
     .title{
       
-        padding:20px 20px;
+        padding:10px 10px;
      
         .title-block{
                 background-color: #3C98FF;
@@ -113,12 +113,11 @@ $themeColor: #FF7142;
         
     }
     .shop-box{
-        padding:0 20px;
+        padding:0 10px;
         .title{
             text-align: center;
             color: #999;
             font-size: 25px;
-            
         }
     }
     .top{
diff --git a/src/pages/home/mainCateSlider/mainCateSlider.js b/src/pages/home/mainCateSlider/mainCateSlider.js
index 9da9a55..e8920d3 100644
--- a/src/pages/home/mainCateSlider/mainCateSlider.js
+++ b/src/pages/home/mainCateSlider/mainCateSlider.js
@@ -14,7 +14,7 @@ class MainCateSlider extends Component {
         this.props.onScrollFromChild(e)
     }
     componentWillReceiveProps(nextProps) {
-        console.log(this.props, nextProps)
+        // console.log(this.props, nextProps)
     }
 
     componentWillUnmount() { }
diff --git a/src/pages/login/login.js b/src/pages/login/login.js
index ee1a6e2..79436e7 100644
--- a/src/pages/login/login.js
+++ b/src/pages/login/login.js
@@ -14,7 +14,8 @@ class Login extends Component {
     this.state = {
       username: '',
       password: '',
-      backgroundImage: 'background-image:url(' + URL.Base + '/Public/images/bg3.jpg);'
+      backgroundImage: 'background-image:url(' + URL.Base + 'Public/images/bg3.jpg);',
+      logoIcon:'background-image:url(' + URL.Base + 'Public/images/com-logo.png);'
     }
   }
 
@@ -79,7 +80,7 @@ class Login extends Component {
         <View className='logo'>
           <View className='image-wrapper'>
             <View className='image-inner-wrapper'>
-              <Image style='width: 240px;height: 80px;background: #fff;' src={URL.Base + '/Public/images/com-logo.png'} />
+              <Image className='icon' style={this.state.logoIcon} />
             </View>
 
             <View className='title'>全屋定制商城</View>
diff --git a/src/pages/login/login.scss b/src/pages/login/login.scss
index 221b579..c1cba87 100644
--- a/src/pages/login/login.scss
+++ b/src/pages/login/login.scss
@@ -15,10 +15,17 @@
             display: flex;
             flex-wrap: nowrap;
             flex-direction: row;
+            height: 100%;
             align-items: center;
+
             .image-inner-wrapper{
                 flex:2;
-
+                .icon{
+                    margin-top: 10px;
+                    width: 400px;
+                    height: 150px;
+                    background: #fff;
+                }
             }
             .title{
                 flex:1;
diff --git a/src/pages/myNeeds/myNeeds.js b/src/pages/myNeeds/myNeeds.js
index 6ac92c9..fbf6c1a 100644
--- a/src/pages/myNeeds/myNeeds.js
+++ b/src/pages/myNeeds/myNeeds.js
@@ -122,7 +122,7 @@ class MyNeeds extends Component {
 
         }
       } else if (JSON.parse(res.data).err_code === 88888) {
-        const response={data:JSON.parse(res.data)}
+        const response = { data: JSON.parse(res.data) }
         loginExpired(response)
 
       }
@@ -388,22 +388,25 @@ class MyNeeds extends Component {
         {/* 开始和结束日期 */}
         <View className='page-section'>
           <View className='picker-box'>
-            <Picker mode='date' className='picker-container' onChange={this.onStartDateChange}>
-              <View className='picker'>
-                <View className='title-box'>
-                  开始日期:<Text className='selected date'>{this.state.startDateSel}</Text>
+            <View className='picker-wrapper'>
+              <Picker mode='date' className='picker-container' onChange={this.onStartDateChange}>
+                <View className='picker'>
+                  <View className='title-box'>
+                    开始日期:<Text className='selected date'>{this.state.startDateSel}</Text>
+                  </View>
                 </View>
+              </Picker>
+            </View>
+            <View className='picker-wrapper'>
 
-              </View>
-            </Picker>
-            <Picker className='picker-container' mode='date' start={this.state.startDateSel} onChange={this.onEndDateChange}>
-              <View className='picker'>
-                <View className='title-box'>
-                  结束日期: <Text className='selected date'>{this.state.endDateSel}</Text>
+              <Picker className='picker-container' mode='date' start={this.state.startDateSel} onChange={this.onEndDateChange}>
+                <View className='picker'>
+                  <View className='title-box'>
+                    结束日期: <Text className='selected date'>{this.state.endDateSel}</Text>
+                  </View>
                 </View>
-              </View>
-            </Picker>
-
+              </Picker>
+            </View>
           </View>
         </View>
         {/* 行业分类开始 */}
diff --git a/src/pages/myNeeds/myNeeds.scss b/src/pages/myNeeds/myNeeds.scss
index 72bda28..717d410 100644
--- a/src/pages/myNeeds/myNeeds.scss
+++ b/src/pages/myNeeds/myNeeds.scss
@@ -76,7 +76,7 @@ $themeColor:#FF7142;
     display: flex;
     flex-wrap: nowrap;
     flex-direction: row;
-    .picker-container{
+    .picker-wrapper{
         flex:1
     }
 
diff --git a/src/pages/mySupplyDemand/mySupplyDemand.js b/src/pages/mySupplyDemand/mySupplyDemand.js
index 1027c80..9a1de20 100644
--- a/src/pages/mySupplyDemand/mySupplyDemand.js
+++ b/src/pages/mySupplyDemand/mySupplyDemand.js
@@ -228,7 +228,7 @@ class MySupplyDemand extends Component {
         this.setState({ isConfirmWindow: false })
         Taro.showLoading({
             title: '加载中'
-          })
+        })
         this.onDelete({ sdID: this.state.demandSupplyId })
 
     }
@@ -434,22 +434,25 @@ class MySupplyDemand extends Component {
                 {/* 开始和结束日期 */}
                 <View className='page-section'>
                     <View className='picker-box'>
-                        <Picker mode='date' className='picker-container' onChange={this.onStartDateChange}>
-                            <View className='picker'>
-                                <View className='title-box'>
-                                    <Text className='title'><Text className='require'>*</Text>开始日期:</Text> <Text className='date'>{this.state.startDateSel}</Text>
-                                </View>
+                        <View className='picker-wrapper'>
+                            <Picker mode='date' className='picker-container' onChange={this.onStartDateChange}>
+                                <View className='picker'>
+                                    <View className='title-box'>
+                                        <Text className='title'><Text className='require'>*</Text>开始日期:</Text> <Text className='date'>{this.state.startDateSel}</Text>
+                                    </View>
 
-                            </View>
-                        </Picker>
-                        <Picker className='picker-container' mode='date' start={this.state.startDateSel} onChange={this.onEndDateChange}>
-                            <View className='picker'>
-                                <View className='title-box'>
-                                    <Text className='title'><Text className='require'>*</Text>结束日期:</Text> <Text className='date'>{this.state.endDateSel}</Text>
                                 </View>
-                            </View>
-                        </Picker>
-
+                            </Picker>
+                        </View>
+                        <View className='picker-wrapper'>
+                            <Picker className='picker-container' mode='date' start={this.state.startDateSel} onChange={this.onEndDateChange}>
+                                <View className='picker'>
+                                    <View className='title-box'>
+                                        <Text className='title'><Text className='require'>*</Text>结束日期:</Text> <Text className='date'>{this.state.endDateSel}</Text>
+                                    </View>
+                                </View>
+                            </Picker>
+                        </View>
                     </View>
                 </View>
 
diff --git a/src/pages/mySupplyDemand/mySupplyDemand.scss b/src/pages/mySupplyDemand/mySupplyDemand.scss
index b78af4c..037356e 100644
--- a/src/pages/mySupplyDemand/mySupplyDemand.scss
+++ b/src/pages/mySupplyDemand/mySupplyDemand.scss
@@ -82,7 +82,7 @@ $themeColor:#FF7142;
     display: flex;
     flex-wrap: nowrap;
     flex-direction: row;
-    .picker-container{
+    .picker-wrapper{
         flex:1
     }
 
diff --git a/src/pages/shop/shop.js b/src/pages/shop/shop.js
index f9a45a6..5d52220 100644
--- a/src/pages/shop/shop.js
+++ b/src/pages/shop/shop.js
@@ -806,14 +806,14 @@ class Shop extends Component {
                 <View className='nav-box'>
                     <View className='nav'>
                         <View className='shop-cate'>
-                            <View>
+                            <View className='interaction'>
                                 <ShopTypeInteractionComp
-                                    url={URL.GetShopCategoryList} style='position:absolute;z-index:2;opacity:0;left:0'
+                                    url={URL.GetShopCategoryList}
                                     shopId={this.state.shop_id}
                                     onPassDataToChild={this.getDataFromShopChild.bind(this)}
                                 ></ShopTypeInteractionComp>
                             </View>
-                            <View className='interactive' onClick={this.showPopUp.bind(this)}>
+                            <View >
                                 <Text className='text'>
                                     店铺全部分类
                                 </Text>
diff --git a/src/pages/shop/shop.scss b/src/pages/shop/shop.scss
index 4577439..56d9f39 100644
--- a/src/pages/shop/shop.scss
+++ b/src/pages/shop/shop.scss
@@ -46,7 +46,7 @@ $themeColor:#FF7142;
         line-height: 55px;
         text-align: center;
         overflow:hidden;
-height:60rpx;
+        height:60rpx;
 
         .text{
         color:white;
@@ -57,10 +57,9 @@ height:60rpx;
             flex:1;
             margin-left: 30px;
             position: relative;
-            .interactive{
+            .interaction{
                 position: absolute;
-                left: 0;
-                top:0;
+                opacity: 0;
             }
         }
         .homepage-link{
diff --git a/src/util/onClickValueService.js b/src/util/onClickValueService.js
index 781c78b..53da28f 100644
--- a/src/util/onClickValueService.js
+++ b/src/util/onClickValueService.js
@@ -4,8 +4,11 @@ export default function onClickValueService(e) {
     let value
     if (process.env.TARO_ENV === 'alipay') {
         value = e.currentTarget.dataset.eOnTapAA
+        
     } else if (process.env.TARO_ENV === 'weapp') {
         value = e.currentTarget.dataset.eTapAA
     }
+        value=typeof(value)==='string'?encodeURIComponent(value):value
+         console.log('value',value)
     return value
 }
\ No newline at end of file