Merge branch 'dev_ren' into 'dev'

行业价格，验证样式，价格精度

See merge request !21

src/views/archiveDataManagement/satelliteManagement/index.vue

@@ -93,8 +93,8 @@
         <el-form-item label="价格" prop="price">
           <el-input-number
             :min="0"
-            :step="1"
-            :precision="0"
+            :step="0.01"
+            :precision="2"
             v-model="form.price"
           ></el-input-number>
         </el-form-item>
@@ -178,11 +178,17 @@ export default {
         price: 0,
         status: 0,
       };
+      this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
     },
     edit(row) {
       this.showAddOrUpd = true;
       this.titleText = "修改卫星传感器";
       this.form = row;
+      this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
     },
     changeSate(row, state) {
       let data = {

src/views/webSiteManagement/industryApplication/applicationList/addUpApp/index.vue

@@ -117,6 +117,17 @@
                 ></el-input>
               </el-col>
             </el-form-item>
+            <el-form-item label="价格" prop="price">
+              <el-col :span="12">
+                <el-input-number
+                  v-model="form.price"
+                  :min="0"
+                  :step="0.01"
+                  :precision="2"
+                  placeholder="请输入价格"
+                ></el-input-number>
+              </el-col>
+            </el-form-item>
             <el-form-item label="是否提供样例" prop="isSample">
               <el-radio-group v-model="form.isSample">
                 <el-radio-button label="是"></el-radio-button>
@@ -204,6 +215,7 @@ export default {
         detailImg: [
           { required: true, message: "请上传详情图", trigger: "blur" },
         ],
+        price: [{ required: true, message: "请输入价格", trigger: "blur" }],
         industry: [{ required: true, message: "请输入行业", trigger: "blur" }],
         region: [{ required: true, message: "请输入地区", trigger: "blur" }],
         collectTime: [
@@ -230,6 +242,7 @@ export default {
         ],
       },
       form: {
+        price: 0, //价格
         title: "", // 应用名称
         coverImg: "", // 封面图
         detailImg: "", // 详情图
@@ -272,6 +285,9 @@ export default {
       this.form.title = info.title;
       this.form.coverImg = info.coverImg;
       this.form.detailImg = info.icon.url;
+      console.log(info);
+      this.form.price = info.price;
+
       this.form.industry = attribute.industry;
       this.form.region = attribute.area;
       this.form.collectTime = attribute.date;
@@ -443,6 +459,7 @@ export default {
             title: this.form.title,
             coverImg: this.form.coverImg,
             detailImg: this.form.detailImg,
+            price: this.form.price,
             introduction: this.form.introduction,
             attribute: JSON.stringify({
               industry: this.form.industry,
@@ -478,6 +495,7 @@ export default {
             coverImg: this.form.coverImg,
             detailImg: this.form.detailImg,
             introduction: this.form.introduction,
+            price: this.form.price,
             attribute: JSON.stringify({
               industry: this.form.industry,
               area: this.form.region,