Merge remote-tracking branch 'origin/release-201830-wangcz' into dev

Dockerfile

@@ -6,6 +6,6 @@ RUN chmod +x run.sh
 #RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
 #RUN cnpm install -g node-gyp
 #RUN cnpm install -g yarn
-RUN yarn config set sass-binary-site http://npm.taobao.org/mirrors/node-sass -g
-RUN yarn
+RUN /opt/yarn-v1.5.1/bin/yarn config set sass-binary-site http://npm.taobao.org/mirrors/node-sass -g
+RUN /opt/yarn-v1.5.1/bin/yarn
 CMD [ "bash", "run.sh" ]

components/default/Footer.vue

@@ -21,8 +21,8 @@
         <div class="item">
           <h5>更多服务</h5>
           <ul class="list-unstyled">
-            <li><a href="http://www.usoftchina.com/"  target="_blank">优软科技</a></li>
-            <li><a href="http://www.ubtob.com" target="_blank">优软云</a></li>
+            <li><a href="http://uas.usoftchina.com/"  target="_blank">优软科技</a></li>
+            <li><a href="http://www.usoftchina.com" target="_blank">优软云</a></li>
           </ul>
         </div>
         <div class="item">
@@ -68,7 +68,7 @@
           url: 'http://www.yitoa.com',
           title: '深圳市英唐智能科技'
         }, {
-          url: 'http://www.usoftchina.com/usoft',
+          url: 'http://uas.usoftchina.com',
           title: '深圳市优软科技'
         }, {
           url: 'http://www.51cube.com',

components/mobile/center/outOfStorage/otherStorage.vue

@@ -56,11 +56,6 @@
         default: 'INBOUND'
       }
     },
-    fetch({route, store}) {
-      return Promise.all([
-        store.dispatch('loadCurrencyData')
-      ])
-    },
     data () {
       return {
         remindText: '',

components/mobile/center/upoff-material.vue

@@ -151,6 +151,10 @@
         firstPrice: {
           type: String,
           default: ''
+        },
+        isFromME: {
+          type: Boolean,
+          default: true
         }
       },
       computed: {
@@ -309,6 +313,12 @@
         },
         // 选择销售方式
         chooseStore(item) {
+          if (!this.isFromME && item === '自营') {
+            this.timeoutCount++
+            this.collectResult = `您还未开店铺，不能选择自营`
+            this.showDrop = false
+            return
+          }
           this.chooseItem.storeInfoOms = item
           this.showdropmenu()
         },

components/mobile/staffManagement/StaffList.vue

@@ -176,8 +176,7 @@
           if (val && val.content) {
             this.AuditList = [...this.AuditList, ...val.content]
           }
-        },
-        immediate: true
+        }
       }
     },
     computed: {

nuxt.config.js

@@ -7,7 +7,7 @@ const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.u
 // 公共物料
 const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共cms
-const cmsUrl = process.env.CMS_URL || (isProdMode ? 'https://cms.usoftmall.com' : 'https://cms.usoftmall.com')
+const cmsUrl = process.env.CMS_URL || (isProdMode ? 'http://cms.usoftchina.com' : 'http://cms.usoftchina.com')
 // 消息
 const messageUrl = process.env.MESSAGE_URL || (isProdMode ? 'https://api-message.ubtob.com/' : 'http://192.168.253.6:24000/message')
 // B2B

pages/mobile/center/vendor/material.vue

@@ -272,7 +272,7 @@
 
     <!-- 物料上下架 -->
     <div>
-      <upoff-material ref="upoffMaterial" :chooseItem="MaterielItem" @upoffMaterial="upoffMaterial" :firstPrice="firstPrice">
+      <upoff-material ref="upoffMaterial" :chooseItem="MaterielItem" @upoffMaterial="upoffMaterial" :firstPrice="firstPrice" :isFromME="isFromME">
 
       </upoff-material>
     </div>
@@ -318,10 +318,14 @@
       }
     },
     created() {
-      this.$http.get('/store-service/stores', { params: { op: 'check' } }).then(response => {
-        this.$store.commit('option/REQUEST_STORE_STATUS_SUCCESS', response.data)
+      this.isFromME = true // 自营
+      this.$http.get('/store-service/stores', { params: { filter: 'enUU', enUU: this.$store.state.option.user.data.enterprise.uu } }).then(response => {
+        if (!response.data.uuid || response.data.uuid === '33069557578d44e69bd91ad12d28a8d4') {
+          this.isFromME = false
+        }
+        // this.$store.commit('option/REQUEST_STORE_STATUS_SUCCESS', response.data)
       }, err => {
-        this.$store.commit('option/REQUEST_STORE_STATUS_FAILURE', err)
+        // this.$store.commit('option/REQUEST_STORE_STATUS_FAILURE', err)
       })
       this.getResourceProvidor()
       // this.MaterielItem.packaging = this.packObj[0]
@@ -866,6 +870,8 @@
         }
         .list {
           /*height: 0.46rem;*/
+          @include overFlowHidden();
+          width: 100%;
           .left {
             float: left;
             overflow: hidden;
@@ -924,7 +930,8 @@
           .text {
             display: inline-block;
             color: #333;
-            font-size: 0.3rem
+            font-size: 0.3rem;
+
           }
           .table {
             width: 5.5rem;

pages/mobile/center/vendor/outOfStorage/index.vue

@@ -54,6 +54,11 @@
   export default {
     middleware: 'authenticated',
     layout: 'mobile',
+    fetch({store}) {
+      return Promise.all([
+        store.dispatch('loadCurrencyData')
+      ])
+    },
     data () {
       return {
         remindText: '',

pages/mobile/order/details.vue

@@ -165,7 +165,7 @@
         <div class="clearfix">
           <div class="name pull-left">发票信息</div>
           <template v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206">
-            <div class="pull-right clearfix" @click="showinvoiceType = !showinvoiceType" style="line-height: 0.88rem;padding: 0;border-bottom: 0;max-width: 6rem;">
+            <div class="pull-right clearfix" @click="ChangeshowinvoiceType()" style="line-height: 0.88rem;padding: 0;border-bottom: 0;max-width: 6rem;">
               <div class="overHiddenText" style="float:left">{{orderList.invoicetitle}}</div>
               <div class="smallfont" style="font-size: 0.24rem;float: left">
                   ({{orderList.invoicetype === 1205 ? '增值税(专用)发票': '增值税普通发票'}})
@@ -265,9 +265,10 @@
     ></remind-str>
     <!-- 发票信息 -->
     <div class="mobile-modal"  @touchmove="preventTouchMove($event)" v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206" v-show="showinvoiceType">
-      <div class="mobile-modal-box mobile-link-en mobile-link-en2" style="margin-top: -4.5rem">
+      <div class="mobile-modal-box mobile-link-en mobile-link-en2" style="margin-top: -3.8rem">
         <div class="mobile-modal-header">发票信息<i @click="showinvoiceType = false" class="icon-guanbi iconfont"></i></div>
-        <div class="order-details-invoiceinfo" >
+        <div class="order-details-invoiceinfo"  ref="invoiceWrapper">
+          <div>
           <div class="order-details-invoiceinfo-content">
             <!--<div class="invoiceList clearfix" >-->
               <!--<div class="pull-left">发票类型：</div>-->
@@ -319,8 +320,12 @@
             <!--</div>-->
             <div class="invoiceList clearfix">
               <div class="pull-left">收票地址：</div>
+              <!---->
               <div class="pull-left">{{invoiceAddress.area}}{{invoiceAddress.detailAddress}}</div>
             </div>
+
+          </div>
+            <div style="position: relative;height: 0.6rem"></div>
           </div>
         </div>
       </div>
@@ -443,6 +448,7 @@
     import { RemindStr } from '~components/mobile/base'
     import { EncryptionFilter } from '~utils/tools.js'
     import { RemindBox } from '~components/mobile/common'
+    import BScroll from 'better-scroll'
     export default {
       name: 'orderdetails',
       layout: 'mobile',
@@ -584,6 +590,15 @@
         }
       },
       methods: {
+        ChangeshowinvoiceType() {
+          this.showinvoiceType = !this.showinvoiceType
+          this.$nextTick(() => {
+            this.invoiceScroll = new BScroll(this.$refs.invoiceWrapper, {
+              click: true
+            })
+
+          })
+        },
         // 确认付款
         gotoPay(item) {
           let id = EncryptionFilter(item.orderid)
@@ -1016,6 +1031,7 @@
       mounted() {
         this.$nextTick(res => {
           this.$refs.listBtn.children.length > 0 ? this.ShowFixedBtn = true : this.ShowFixedBtn = false
+
         })
       }
     }
@@ -1817,17 +1833,17 @@
       left: 2.5%;
     }
     .order-details-invoiceinfo {
-      max-height:65vh;
-      overflow-y: auto;
+      max-height: 65vh;
+      overflow: hidden;
       background: #f3f3f3;
       padding: 0.2rem;
       border-bottom-left-radius: 0.07rem;
       border-bottom-right-radius: 0.07rem;
+      position: relative;
       .order-details-invoiceinfo-content {
         background: #fff;
         padding: 0.3rem 0.2rem;
         border-radius: 0.07rem;
-        position: relative;
         border: 1px solid #dcdcdc;
         img {
           position: absolute;