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

TaoHuang
Commit 476a5a18c51e5676c70983729a0749ddb34a1ec0 2 parents dc7858a3 3ae8989f
Showing 8 changed files with 14 additions and 32 deletions
apps/pages/home/bindAccount/bindAccount.vue
apps/pages/home/channel/channel.vue
apps/pages/home/mine/components/tabItem.vue
apps/pages/home/mine/mine.vue
apps/pages/order/buyer-ask-order.vue
apps/pages/order/seller-ask-order.vue
apps/pages/product/components/buy-sheet.vue
apps/store/home/mine.js
--- a/apps/pages/home/bindAccount/bindAccount.vue
View file @476a5a1
+++ b/apps/pages/home/bindAccount/bindAccount.vue
View file @476a5a1
 <template>
   <LayoutApp :show-back="true" title="绑定支付宝">
     <div class="body" ref="body">
-      <Scroll class="scroll-content">
       <div class="account-form">
           <p class="form-title">账号</p>
           <div class="form-input-block">
@@ -15,7 +14,6 @@
       <div class="account-footer">
         <CubeButton class="submit-btn" :disabled="canSubmit" @click="submitBind">提交</CubeButton>
       </div>
-      </Scroll>
     </div>
     <myDialog :isShow="dialogShow" :data="{name,account}" @cancel-click="cancel" @confirm-click="confirm"></myDialog>
   </LayoutApp>
@@ -24,7 +22,7 @@
 <script>
 import { createNamespacedHelpers } from 'vuex';
-import {Input, Button, Scroll, Style} from 'cube-ui';
+import {Input, Button, Style} from 'cube-ui';
 import myDialog from './components/bindModel';
 const {mapState, mapActions} = createNamespacedHelpers('home/bindAccount');
 export default {
@@ -72,7 +70,6 @@ export default {
     },
     components: {
       Style,
-      Scroll,
       CubeInput: Input,
       CubeButton: Button,
       myDialog
@@ -88,9 +85,6 @@ export default {
     background-color: white;
     padding: 0 40px;
 }
-/deep/ .cube-scroll-content {
-  height: 100%;
-}
 .account-form {
       margin-top: 40px;
     }
--- a/apps/pages/home/channel/channel.vue
View file @476a5a1
+++ b/apps/pages/home/channel/channel.vue
View file @476a5a1
@@ -168,8 +168,8 @@ export default {
           eleHeight = this.$refs[index][0].$el.offsetHeight;
           eleTop = this.$refs[index][0].$el.offsetTop;
         } else {
-          eleHeight = this.$refs.scrollNav.offsetHeight;
-          eleTop = this.$refs.scrollNav.offsetTop;
+          eleHeight = this.navHeight;
+          eleTop = this.navTop;
         }
         if(scrollY) { // 滚动时
           if(scrollHeight + scrollY > eleTop && item.template_name === 'guessLike') {
--- a/apps/pages/home/mine/components/tabItem.vue
View file @476a5a1
+++ b/apps/pages/home/mine/components/tabItem.vue
View file @476a5a1
@@ -105,7 +105,7 @@ export default {
 }
 .grey {
   background-color: #F2F2F2;
-  // margin: 0 -40px;
+  margin: 0 -40px;
   padding: 0 40px;
 }
--- a/apps/pages/home/mine/mine.vue
View file @476a5a1
+++ b/apps/pages/home/mine/mine.vue
View file @476a5a1
 <template>
   <LayoutApp :show-back="true" title="我的" :hideHeader="hideHeader">
     <div class="body" ref="body">
-      <Scroll>
       <div v-for="(value, key) in getMineList" :key="key">
         <tab-item v-if="key === 'board'" :data="value" noLine icon="cubeic-notification" small grey>
           <noticeScroll></noticeScroll>
         </tab-item>
         <template v-else-if="key === 'resource1' || key === 'resource2'">
-          <div v-if="value.data.template_name ==='single_image'" class="marg">
+          <div v-if="value.data.template_name ==='single_image'">
             <singleImage :data="value.data.data[0]"></singleImage>
           </div>
         </template>
-        <div v-else-if="key === 'order'" class="bg-bottom marg">
+        <div v-else-if="key === 'order'" class="bg-bottom">
           <order></order>
         </div>
-        <div v-else-if="key === 'sale'" class="bg-top marg">
+        <div v-else-if="key === 'sale'" class="bg-top">
           <tab-item :data="value" noLine titleBold titleSmall></tab-item>
         </div>
-        <bind  class="marg" v-else-if="key === 'bindAccount'" :data="value"></bind>
-        <tab-item  class="marg" v-else :data="value"></tab-item>
+        <bind  v-else-if="key === 'bindAccount'" :data="value"></bind>
+        <tab-item  v-else :data="value"></tab-item>
       </div>
-      </Scroll>
     </div>
   </LayoutApp>
 </template>
@@ -31,7 +29,6 @@ import order from './components/order';
 import scroll from './components/scroll';
 import singleImage from './components/singleImage';
 import bind from './components/bind';
-import {Style, Scroll} from 'cube-ui';
 import { createNamespacedHelpers } from 'vuex';
 const { mapGetters, mapActions } = createNamespacedHelpers('home/mine');
@@ -73,9 +70,6 @@ export default {
     noticeScroll: scroll,
     singleImage,
     bind,
-    Style,
-    Scroll
-
   }
 };
 </script>
@@ -83,12 +77,9 @@ export default {
 <style lang="scss" scoped>
 .body {
   height: 100%;
-  // overflow-y: auto;
+  overflow-y: auto;
   background-color: white;
-  // padding: 0 40px;
-}
-.marg {
-  margin: 0 40px;
+  padding: 0 40px;
 }
 .bg-top,
--- a/apps/pages/order/buyer-ask-order.vue
View file @476a5a1
+++ b/apps/pages/order/buyer-ask-order.vue
View file @476a5a1
 <!--买家求购确认页-->
 <template>
   <LayoutApp :show-back="true" title="出价求购">
-    <cube-scroll :options="options">
     <div class="body" ref="body">
 <div class="topContainer">
@@ -77,7 +76,6 @@
 </div>
     </div>
-    </cube-scroll>
     <div class="bottomContainer">
       <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
       <div class="btn-wrapper">
--- a/apps/pages/order/seller-ask-order.vue
View file @476a5a1
+++ b/apps/pages/order/seller-ask-order.vue
View file @476a5a1
 <!--卖家求购变现-->
 <template>
   <LayoutApp :show-back="true" title="变现">
-    <cube-scroll :options="options">
     <div class="body">
       <!--<TitleComp txt="变现"></TitleComp>-->
@@ -17,7 +16,6 @@
       <AddressInfo :data="addressInfo" class="order-item"></AddressInfo>
     </div>
-    </cube-scroll>
     <div class="footer">
       <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
       <div class="btn-wrapper">
--- a/apps/pages/product/components/buy-sheet.vue
View file @476a5a1
+++ b/apps/pages/product/components/buy-sheet.vue
View file @476a5a1
@@ -71,6 +71,7 @@ export default {
           size_id: info.size_id,
           name: name[0],
           subName: name[1],
+          size_name: info.size_name,
           price,
           storage_id: info.storage_id,
           available: info.storage_num > 0 && price !== '-',
@@ -124,7 +125,7 @@ export default {
               this.$store.commit('order/buyerAskOrder/BUYER_ASK_SET_PRODUCTINFO', {
                 bid_moster_price: get(product, 'bid_moster_price', ''),
                 least_price: get(product, 'least_price', ''),
-                sizeName: product.name,
+                sizeName: product.size_name,
                 sizeId: get(data, 'sizeId', ''),
                 colorName: get(this.productDetail, 'goods_list[0].color_name', ''),
                 product_name: this.goodsName,
--- a/apps/store/home/mine.js
View file @476a5a1
+++ b/apps/store/home/mine.js
View file @476a5a1
@@ -90,7 +90,7 @@ export default function() {
       },
       getMineList(state) {
         let tabList = {
-          board: { title: '', page: 'noticeList' },
+          // board: { title: '', page: 'noticeList' },
           sale: {
             title: '出售中',
             num: state.sellerNum,