Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-ui-pc into dev

src/api/common.js

@@ -4,9 +4,9 @@ import request from '@/utils/request'
  * 附件
  * @param {*} data
  */
-export const privateFileSaveUrl = '/api/v1/mp/image/remote/upload/1'
+export const privateFileSaveUrl = '/api/v1/mp/image/remote/upload/commpress/1'
 
-export const publicFileSaveUrl = '/api/v1/mp/image/remote/upload/0'
+export const publicFileSaveUrl = '/api/v1/mp/image/remote/upload/commpress/0'
 
 // 云端非公开可访问的BaseUrl
 export const privateFileGetUrl = '/api/v1/mp/file/remote/download?name='
@@ -23,7 +23,7 @@ export function publicFileSaveAPI(data, config = {}) {
     formData.append(key, data[key])
   })
   return request({
-    url: '/api/v1/mp/image/remote/upload/0',
+    url: '/api/v1/mp/image/remote/upload/commpress/0',
     method: 'put',
     data: formData ,
     ...config,
@@ -42,7 +42,7 @@ export function privateFileSaveAPI(data, config = {}) {
     formData.append(key, data[key])
   })
   return request({
-    url: '/api/v1/mp/image/remote/upload/1',
+    url: '/api/v1/mp/image/remote/upload/commpress/1',
     method: 'put',
     data: formData ,
     ...config,

src/views/business/goods/add.vue

@@ -47,7 +47,7 @@
             <el-select
               v-model="addData.tagIds"
               placeholder="请选择商品标签"
-              multiple 
+              multiple
               clearable
             >
               <el-option :label="item.name" :value="item.tagId" v-for="(item, index) in goodsTagItemsList" :key="index" />
@@ -74,7 +74,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-row v-if="addData.multiSku === 0" :gutter="40" style="width: 600px">
         <el-col :span="23">
           <el-form-item label="价格:" prop="value">
@@ -84,8 +84,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="兑换盲豆数量:" prop="value">
-            <el-input :value="(addData.value * 10).toFixed(0)" type="number" readonly disabled>
+          <el-form-item label="兑换盲豆数量:" prop="exchangePrice">
+            <el-input v-model="addData.exchangePrice" type="number" placeholder="请输入盲豆数量">
               <template slot="append">盲豆</template>
             </el-input>
           </el-form-item>
@@ -155,12 +155,12 @@ export default {
         exchangeShow: [{ required: true, message: '请选择是否支持盲豆兑换', trigger: 'change' }],
         multiSku: [{ required: true, message: '请选择SKU类型', trigger: 'change' }],
         value: [
-          { required: true, message: '请输入商品价格', trigger: 'blur' },
+          { required: true, message: '请输商品入价格', trigger: 'blur' },
           { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }
         ],
         exchangePrice: [
-          { required: true },
-          // { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
+          { required: true,message:'请输入盲豆数量', trigger: 'blur' },
+          { pattern: /^([1-9]\d*)$/, message: "请输入正确盲豆数量", trigger: ["blur", "change"] }
         ],
         cost: [
           { required: false, message: '请输入采购价格', trigger: 'blur' },
@@ -229,11 +229,11 @@ export default {
       this.$refs.addItem.validate((valid, items) => {
         if (valid) {
           this.addData.skuList = skuList
-          const { value, cost, description, ...rest } = this.addData
+          const { value, cost,exchangePrice, description, ...rest } = this.addData
           addGoods({...rest, ...{
             value: accMul(value, 100),
             cost: cost == '' || cost == null ? '' : accMul(cost, 100),
-            exchangePrice: accMul(value, 10),
+            exchangePrice: accMul(exchangePrice, 1),
             description: encodeURI(description)
           }}).then(res => {
             if (res.code === 0) {

src/views/business/goods/components/spec.vue

@@ -68,8 +68,9 @@
             </el-form-item>
           </td>
           <td>
-            <el-form-item :prop="`skuList.${index}.valueY`" :rules="exchangeRules">
-              <p>{{ (sku.valueY * 10).toFixed(0) }}</p>
+            <el-form-item :prop="`skuList.${index}.exchange`" :rules="exchangeRules">
+<!--              <p>{{ (sku.valueY * 10).toFixed(0) }}</p>-->
+              <el-input v-model="sku.exchange" />
             </el-form-item>
           </td>
           <td class="pd">
@@ -117,9 +118,16 @@ export default {
       skuList: [],
       specValTmp: '',
       specifications: [],
-      valueYRules: [{ required: true, message: '请输入价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"]}],
-      costYRules: [{ required: false, message: '请输入采购价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
-      exchangeRules: [{ required: true, trigger: 'blur' }]
+      valueYRules: [
+        { required: true, message: '请输入价格', trigger: 'blur' },
+        { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"]}],
+      costYRules: [
+        { required: false, message: '请输入采购价格', trigger: 'blur' },
+        { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
+      exchangeRules: [
+        { required: true,message:'请输入盲豆数量', trigger: 'blur' },
+        { pattern: /^([1-9]\d*)$/, message: "请输入正确的盲豆数量", trigger: ["blur", "change"] }
+      ]
     }
   },
   directives: {
@@ -154,6 +162,7 @@ export default {
       this.specListTmp = JSON.parse(JSON.stringify(this.specList))
       this.skuList = sku.map(item => {
         this.$set(item, 'valueY', accDiv(item.value, 100))
+        this.$set(item, 'exchange', accDiv(item.exchangePrice,1))
         this.$set(item, 'costY', item.cost == null ? '' : accDiv(item.cost, 100) )
         this.$set(item, 'picUrlArr', item.picUrl.split(',').map(item => { return { fileName: item }}))
         this.$set(item, 'status', !!item.quantity)
@@ -177,7 +186,7 @@ export default {
       }
       if (spec.vals.find(item => item === this.specValTmp)) {
         this.$message.warning('规格值已存在')
-        return 
+        return
       }
       spec.vals.push(this.specValTmp)
       this.specValTmp = ''
@@ -284,9 +293,9 @@ export default {
       this.$refs.sku.validate((valid, items) => {
         if (valid) {
           this.skuList.forEach(item => {
-            const { valueY, costY } = item
+            const { valueY,exchange, costY } = item
             item.value = accMul(valueY, 100)
-            item.exchangePrice = accDiv(item.value, 10)
+            item.exchangePrice = accMul(exchange, 1)
             item.cost = costY == '' ? '' : accMul(costY, 100)
             item.picUrl = item.picUrlArr.map(item => { return item.fileName }).toString()
           })
@@ -330,6 +339,6 @@ export default {
       color: red;
     }
   }
-  
+
 }
 </style>