Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

components/register-saler/register/StepThird.vue

@@ -104,18 +104,6 @@
               <div class="add-brand row">
                 <a href="javascript:void(0)" title="增加品牌" @click="addBrand"><em><i class="fa fa-plus-circle"></i>增加品牌</em></a>
               </div>
-              <!--主营产品-->
-              <div class="row brand-type">
-                <div class="col-md-1" style="padding:0;">主营产品<em>*</em></div>
-                <div class="col-md-10">
-                  <textarea v-model="description"
-                            style="line-height: 20px;font-size: 14px;margin-top:25px;"
-                            rows="8"
-                            @blur.stop.prevent="onDescription()"
-                            class="form-control"
-                            placeholder="例：本店主营Panasonic、IT、三星等知名品牌的触控IC、显示驱动IC、液晶屏、功率模块类、电源芯片、高压熔断、被动器件等产品。"></textarea>
-                </div>
-              </div>
             </div>
             <!--原厂end-->
             <!--代理商 begin-->
@@ -228,6 +216,18 @@
               </div>
             </div>
             <!--经销商 end-->
+            <!--主营产品-->
+            <div class="row brand-type">
+              <div class="col-md-1" style="padding:0;">主营产品<em>*</em></div>
+              <div class="col-md-10">
+                  <textarea v-model="description"
+                            style="line-height: 20px;font-size: 14px;margin-top:25px;"
+                            rows="8"
+                            maxlength="500"
+                            class="form-control"
+                            placeholder="例：本店主营Panasonic、IT、三星等知名品牌的触控IC、显示驱动IC、液晶屏、功率模块类、电源芯片、高压熔断、被动器件等产品。"></textarea>
+              </div>
+            </div>
           </div>
           <!-- Submit button -->
          <!-- <div style="padding: 28px 40px;">
@@ -285,6 +285,7 @@
     data () {
       return {
         tab: 'ORIGINAL_FACTORY',
+        description:'',
         brands: [{
           type: 'BRAND',
           name: '',
@@ -469,6 +470,9 @@
         if (this.businessLicenseUrl === '') {
           this.$message.error('请上传营业执照')
           this.showLoading = false
+        } else if (this.description === '') {
+            this.$message.error('请填写主营产品信息')
+            this.showLoading = false
         } else {
           if (this.brands[0].name === '') {
             validCode = 1
@@ -505,6 +509,7 @@
             })
             // 申请开店
             this.$http.post('/store-service/applications', {
+              applyDescription: this.description,
               brands: tmpBrands,
               qualifications: qualifications,
               type: this.tab

pages/mobile/center/vendor/outOfStorage/purchase/_storeid.vue

@@ -169,7 +169,7 @@
             let arr = []
             this.storageList.purchaseDetails.forEach(val => {
               if(val.qty) {
-                arr.push({id: val.id, qty: val.qty})
+                arr.push({id: val.id, qty: Number(val.qty)})
               }
             })
             if(arr.length <= 0) {

pages/mobile/order/details.vue

@@ -668,7 +668,7 @@
                   this.showSend = true
                   // if (item.inid) {
                   //   this._id = EncryptionFilter(item.inid)
-                  //   this.$http.get(`/trade/inFpu/tobeshipped/${this._id}`).then(res => {
+                  //   this.$http.get(`/trade/invoice/inFpu/tobeshipped/${this._id}`).then(res => {
                   //     this.sendGoodsInfo = res.data[0]
                   //     this.sendGoodsInfo.area = JSON.parse(res.data[0].jsonSpAddress)
                   //     this.showSend = true
@@ -676,7 +676,7 @@
                   // } else {
                   //   this.$http.get(`/trade/purchase/vendor/tobeshiped/${item.id}`).then(res => {
                   //     this._id = EncryptionFilter(res.data.inId)
-                  //     this.$http.get(`/trade/inFpu/tobeshipped/${this._id}`).then(res => {
+                  //     this.$http.get(`/trade/invoice/inFpu/tobeshipped/${this._id}`).then(res => {
                   //       this.sendGoodsInfo = res.data[0]
                   //       this.sendGoodsInfo.area = JSON.parse(res.data[0].jsonSpAddress)
                   //       this.showSend = true
@@ -745,7 +745,7 @@
                 }
               }
               sendInfo.map = _obj
-              this.$http.post(`/trade/inFpu/save?id=${this.sendGoodsInfo.id}`, sendInfo).then(res => {
+              this.$http.post(`/trade/invoice/inFpu/save?id=${this.sendGoodsInfo.id}`, sendInfo).then(res => {
                 if (res.data.success) {
                   this.onMind('发货成功')
                   setTimeout(() => {

pages/mobile/order/index.vue

@@ -523,7 +523,7 @@
                 // } else {
                 //   this.$http.get(`/trade/purchase/vendor/tobeshiped/${item.id}`).then(res => {
                 //     this._id = EncryptionFilter(res.data.inId)
-                //     this.$http.get(`/trade/inFpu/tobeshipped/${this._id}`).then(res => {
+                //     this.$http.get(`/trade/invoice/inFpu/tobeshipped/${this._id}`).then(res => {
                 //       this.sendGoodsInfo = res.data[0]
                 //       this.sendGoodsInfo.area = JSON.parse(res.data[0].jsonSpAddress)
                 //       this.showSend = true
@@ -592,7 +592,7 @@
               }
             }
             sendInfo.map = _obj
-            this.$http.post(`/trade/inFpu/save?id=${this.sendGoodsInfo.id}`, sendInfo).then(res => {
+            this.$http.post(`/trade/invoice/inFpu/save?id=${this.sendGoodsInfo.id}`, sendInfo).then(res => {
               if (res.data.success) {
                 this.onMind('发货成功')
                 setTimeout(() => {