联合丽格V1.0.2

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -834,7 +834,7 @@ var SupplierApi = {
          */
         checkeReceipt : function (params, callback) {
             Http.AjaxService({
-                url:' ',
+                url:'/order/shop/check/receipt',
                 type:'GET',
                 data:params,
                 json:false,

src/main/resources/static/js/supplier-center/order/delivergoods.js

@@ -10,6 +10,7 @@ var delivergoods = new Vue({
         allChecked: false,
         check:false,
         open: false,
+        order:{}
     },
     methods: {
         returnBack:function(){
@@ -26,7 +27,7 @@ var delivergoods = new Vue({
                       _self.submitIds.splice(_self.submitIds.indexOf(order), 1);
                     }
                     console.log(_self.submitIds)
-                    if(_self.submitIds.length==_self.productList.length){
+                    if(_self.submitIds.length===_self.productList.length){
                         _self.allChecked=true;
                     }else {
                        _self.allChecked=false;
@@ -49,7 +50,7 @@ var delivergoods = new Vue({
         },
         delivery:function () {
             var _this = this;
-            if(_this.submitIds.length==0){
+            if(_this.submitIds.length===0){
                 CAIMEI.dialog('请至少选择一项商品进行发货',false);
             }else {
                  CAIMEI.Modal('确定发货吗？确定后将不能修改','取消','确定',function () {
@@ -85,8 +86,9 @@ var delivergoods = new Vue({
         getDataInfo:function (){
             var _self = this;
             SupplierApi.ShipmentsInfo({shopOrderId: _self.shopOrderId}, function (response) {
-                if (response.code == 0) {
+                if (response.code === 0) {
                     var data = response.data
+                    _self.order = data;
                     _self.userInfo = data.userInfo;
                     data.orderProductList.forEach(function(order){
                         order.inputVal = order.notOutStore - order.actualCancelNum;

src/main/resources/static/js/supplier-center/order/order-edit.js

@@ -106,7 +106,7 @@ const seeDetail = new Vue({
                 SupplierApi.orderUpdate(JSON.stringify(_self.params), function (response) {//列表初始化
                     if (response.code === 0) {
                         CAIMEI.dialog('修改成功',true,function () {
-                            _self.seeshopDetails()
+                            window.location.href = '/supplier/order/details.html?shopOrderId='+_self.shopOrderId;
                         })
                     }
                 })

src/main/resources/static/js/supplier-center/shop/mixins/checkeMixins.js

@@ -245,13 +245,15 @@ var checkeMixins = function () {
                     },3000);
                     return;
                 }
-                if(!this.checkedSku()){
-                    _this.isSkuRule = true;
-                    _this.fromMessage = '请将【采美】平台SKU数据补充完整';
-                    setTimeout(function(){
-                        _this.isSkuRule = false;
-                    },3000);
-                    return;
+                if(this.platformsFlag){
+                    if(!this.checkedSku()){
+                        _this.isSkuRule = true;
+                        _this.fromMessage = '请将【采美】平台SKU数据补充完整';
+                        setTimeout(function(){
+                            _this.isSkuRule = false;
+                        },3000);
+                        return;
+                    }
                 }
                 if(this.platformsMallFlag){
                     if(!this.checkedMallSku()){

src/main/resources/static/js/supplier-center/shop/mixins/releaseMixins.js

@@ -27,6 +27,7 @@ var releaseMixins = function () {
         },
         mounted: function() {
             this.skuParams.push(defaultSku())
+            this.mallSkusParams.push(defaultSku())
         },
         methods: {
             //选择平台
@@ -34,18 +35,18 @@ var releaseMixins = function () {
                 item.isChecked = !item.isChecked
                 if(index === 0){
                     this.platformsFlag = item.isChecked
-                    if(item.isChecked){
-                        this.skuParams.push(defaultSku())
-                    }else{
-                        this.mallSkusParams =[]
-                    }
+                    // if(item.isChecked){
+                    //     this.skuParams.push(defaultSku())
+                    // }else{
+                    //     this.mallSkusParams =[]
+                    // }
                 }else{
                     this.platformsMallFlag = item.isChecked
-                    if(item.isChecked){
-                        this.mallSkusParams.push(defaultSku())
-                    }else{
-                        this.mallSkusParams =[]
-                    }
+                    // if(item.isChecked){
+                    //     this.mallSkusParams.push(defaultSku())
+                    // }else{
+                    //     this.mallSkusParams =[]
+                    // }
                 }
                 if(this.platformsFlag && this.platformsMallFlag){
                     this.releaseParams.groundMall = '0,4'

src/main/resources/templates/supplier-center/order/remarks-details.html

@@ -37,19 +37,23 @@
               </div>
               <div class="remarks-label">备注内容：</div>
               <div class="remarks-text">{{ remarks.remarks }}</div>
-              <div class="remarks-label">图片：</div>
-              <div class="remarks-img">
-                <a :href="imgs" v-for="(imgs,imgIndex) in remarks.images" target="_blank">
-                  <img class="imgs" :src="imgs" >
-                </a>
-              </div>
-              <div class="remarks-label">文件：</div>
-              <div class="remarks-file">
-                <div v-for="file, i in remarks.ossFiles" :key="i">
-                  <span class="text">{{ file.name }}</span>
-                  <el-button type="text" @click="handlerDownload(file)">下载</el-button>
+              <template v-if="remarks.images">
+                <div class="remarks-label">图片：</div>
+                <div class="remarks-img">
+                  <a :href="imgs" v-for="(imgs,imgIndex) in remarks.images" target="_blank">
+                    <img class="imgs" :src="imgs" >
+                  </a>
                 </div>
-              </div>
+              </template>
+              <template v-if="remarks.ossFiles">
+                <div class="remarks-label">文件：</div>
+                <div class="remarks-file">
+                  <div v-for="file, i in remarks.ossFiles" :key="i">
+                    <span class="text">{{ file.name }}</span>
+                    <el-button type="text" @click="handlerDownload(file)">下载</el-button>
+                  </div>
+                </div>
+              </template>
             </div>
           </template>
           <div class="empty" v-else>

src/main/resources/templates/supplier-center/shop/goods.html

@@ -189,8 +189,8 @@
                                         <el-tag v-if="row.validFlag===2" type="success" size="small">已上架</el-tag>
                                         <el-tag v-if="row.validFlag===3" type="danger" size="small">已下架</el-tag>
                                         <el-tag v-if="row.validFlag===8" type="danger" size="small">审核未通过</el-tag>
-                                        <el-tag v-if="row.validFlag===9" type="danger" size="small">已冻结</el-tag>
-                                        <el-tag v-if="row.validFlag===10" type="danger" size="small">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===9" type="danger" size="small">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===10" type="danger" size="small">已冻结</el-tag>
                                     </P>
                                 </template>
                                 <template v-else-if="row.groundMall === '4'">
@@ -209,8 +209,8 @@
                                         <el-tag v-if="row.validFlag===2" type="success" size="small">已上架</el-tag>
                                         <el-tag v-if="row.validFlag===3" type="danger" size="small">已下架</el-tag>
                                         <el-tag v-if="row.validFlag===8" type="danger" size="small">审核未通过</el-tag>
-                                        <el-tag v-if="row.validFlag===9" type="danger" size="small">已冻结</el-tag>
-                                        <el-tag v-if="row.validFlag===10" type="danger" size="small">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===9" type="danger" size="small">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===10" type="danger" size="small">已冻结</el-tag>
                                     </P>
                                     <P>
                                         【丽格集采联盟平台】