Merge branch '云仓3.0.1' into test

src/views/system/goods/add/components/goodsinfomation.vue

@@ -294,6 +294,7 @@
     mounted() {
       if(this.goodsinfodata.goods_id) {
         this.goodsInfoForm = this.goodsinfodata;
+        this.vediosrc = this.goodsinfodata.video
         if( this.goodsInfoForm.imgs.length > 0 ) {
           this.goodsInfoForm.imgs.forEach( (item )=> {
             let objImg = { 'url': '' }

src/views/system/goods/add/components/goodsparameter.vue

@@ -377,12 +377,40 @@ export default {
     },
     /** 一键应用所有 */
     applyAllTable(key) {
-      this.$prompt('', '批量设置价格', {
+      // js_price: '', // 协议价
+      //     sl_price: '', // 结算价
+      //     price: '',    // 指导价
+      //     sc_price: '', // 市场价
+      //     stock: '',    // 库存
+      //     weight: '',   // 重量 g
+      let text = ''
+      let pacee = ''
+      if(key == 'js_price'){
+        text = '批量设置协议价'
+        pacee = '请输入协议价'
+      }
+      if(key == 'price'){
+        text = '批量设置指导价'
+        pacee = '请输入指导价'
+      }
+      if(key == 'sc_price'){
+        text = '批量设置市场价'
+        pacee = '请输入市场价'
+      }
+      if(key == 'stock'){
+        text = '批量设置库存量'
+        pacee = '请输入库存量'
+      }
+      if(key == 'weight'){
+        text = '批量设置重量'
+        pacee = '请输入重量'
+      }
+      this.$prompt('', text, {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           inputPattern: /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/ ,
           inputErrorMessage: '金额须大于零',
-          inputPlaceholder:'输入协议价',
+          inputPlaceholder:pacee,
           center: true
         }).then(({ value }) => {
             this.parameterdata.specs_group.map(item => {