natasha 3 роки тому
батько
коміт
d137caa91f

+ 5 - 5
src/components/pyment/Confirmorder.vue

@@ -15,7 +15,7 @@
         <p class="p3">{{ data.author }}</p>
       </div>
       <div class="price">
-        <p>¥{{ data.price }}</p>
+        <p>¥{{ data.price.toFixed(2) }}</p>
       </div>
     </div>
     <div class="promotionCode">
@@ -36,7 +36,7 @@
         <!-- 确定 -->
         {{ $t("Key94") }}</span
       >
-      <span class="sp2" v-else>-{{ discount_money }}</span>
+      <span class="sp2" v-else>-{{ discount_money.toFixed(2) }}</span>
     </div>
     <div class="total">
       <p class="p1">
@@ -45,21 +45,21 @@
 
           {{ $t("Key53") }}:</span
         >
-        <span class="co-value">¥{{ data.price }}</span>
+        <span class="co-value">¥{{ data.price.toFixed(2) }}</span>
       </p>
       <p class="p2">
         <span>
           <!-- 优惠折扣 -->
           {{ $t("Key54") }}:</span
         >
-        <span class="co-value">-¥{{ discount_money }}</span>
+        <span class="co-value">-¥{{ discount_money.toFixed(2) }}</span>
       </p>
       <p class="p3">
         <span>
           <!-- 应付  -->
           {{ $t("Key55") }}:</span
         >
-        <span class="co-value">¥{{ receivables_money }}</span>
+        <span class="co-value">¥{{ receivables_money.toFixed(2) }}</span>
       </p>
     </div>
     <div class="submitBtn">

+ 5 - 4
src/components/pyment/Payment.vue

@@ -15,7 +15,7 @@
         <p class="p3">{{ data.author }}</p>
       </div>
       <div class="price">
-        <p>¥{{ data.price }}</p>
+        <p>¥{{ data.price.toFixed(2) }}</p>
       </div>
     </div>
     <div class="pay-platform">
@@ -37,14 +37,14 @@
           <!-- 一件商品,总金额:  -->
           {{ $t("Key53") }}:</span
         >
-        <span class="co-value">¥{{ data.price }}</span>
+        <span class="co-value">¥{{ data.price.toFixed(2) }}</span>
       </p>
       <p class="p2">
         <span>
           <!-- 优惠折扣 -->
           {{ $t("Key54") }}:
         </span>
-        <span class="co-value">-¥{{ data.discount_money }}</span>
+        <span class="co-value">-¥{{ data.discount_money.toFixed(2) }}</span>
       </p>
       <p class="p4">
         <span></span>
@@ -58,7 +58,7 @@
           <!-- 应付  -->
           {{ $t("Key55") }}:
         </span>
-        <span class="co-value">¥{{ data.receivables_money }}</span>
+        <span class="co-value">¥{{ data.receivables_money.toFixed(2) }}</span>
       </p>
     </div>
     <div class="submitBtn">
@@ -298,6 +298,7 @@ export default {
     .useCode {
       font-size: 12px;
       color: rgba(0, 0, 0, 0.5);
+      word-break: break-word;
     }
     > p {
       > span {

+ 46 - 38
src/views/courseList.vue

@@ -172,18 +172,26 @@
       :visible.sync="dialogFlag"
       :close-on-click-modal="false"
     >
-      <el-form :model="formDialog" :rules="courseListRules" ref="formDialog">
+      <el-form ref="formDialog" :model="formDialog" :rules="courseListRules">
         <el-form-item
           class="label-input"
           label="名称"
           label-width="90px"
           prop="name"
         >
+          <el-input v-model="formDialog.name" autocomplete="off" name="name" />
+        </el-form-item>
+        <el-form-item
+          class="label-input"
+          label="英文名"
+          label-width="90px"
+          prop="name_english"
+        >
           <el-input
+            v-model="formDialog.name_english"
             autocomplete="off"
-            name="name"
-            v-model="formDialog.name"
-          ></el-input>
+            name="name_english"
+          />
         </el-form-item>
         <el-form-item label="教材类型" label-width="90px" prop="type_id">
           <!-- -->
@@ -203,27 +211,15 @@
         </el-form-item>
         <el-form-item
           class="label-input"
-          label="英文名"
-          label-width="90px"
-          prop="name_english"
-        >
-          <el-input
-            autocomplete="off"
-            name="name_english"
-            v-model="formDialog.name_english"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          class="label-input"
           label="作者"
           label-width="90px"
           prop="author"
         >
           <el-input
+            v-model="formDialog.author"
             autocomplete="off"
             name="author"
-            v-model="formDialog.author"
-          ></el-input>
+          />
         </el-form-item>
         <el-form-item
           class="label-input"
@@ -232,10 +228,10 @@
           prop="edition"
         >
           <el-input
+            v-model="formDialog.edition"
             autocomplete="off"
             name="edition"
-            v-model="formDialog.edition"
-          ></el-input>
+          />
         </el-form-item>
         <el-form-item
           class="label-input"
@@ -244,10 +240,10 @@
           prop="publisher"
         >
           <el-input
+            v-model="formDialog.publisher"
             autocomplete="off"
             name="publisher"
-            v-model="formDialog.publisher"
-          ></el-input>
+          />
         </el-form-item>
         <el-form-item
           class="label-input"
@@ -256,10 +252,10 @@
           prop="publish_number"
         >
           <el-input
+            v-model="formDialog.publish_number"
             autocomplete="off"
             name="publish_number"
-            v-model="formDialog.publish_number"
-          ></el-input>
+          />
         </el-form-item>
         <el-form-item
           class="label-input"
@@ -280,46 +276,55 @@
           prop="price"
         >
           <el-input
-            @blur="blurPrice"
-            @input="inputPrice"
+            v-model="formDialog.price"
             autocomplete="off"
             name="price"
             type="number"
-            v-model="formDialog.price"
-          ></el-input>
+            @blur="blurPrice"
+            @input="inputPrice"
+          />
         </el-form-item>
         <el-form-item label="所属机构" label-width="90px" prop="org_id">
           <!-- -->
           <el-select
-            @change="changeAgency"
+            ref="selects"
+            v-model="formDialog.org_id"
             name="agency"
             placeholder="请选择机构"
-            v-model="formDialog.org_id"
-            ref="selects"
+            @change="changeAgency"
           >
             <el-option
+              v-for="(statusItem, index) in diaMyOrgList"
               :key="'diaMyOrgList' + index"
               :label="statusItem.org_name"
               :value="statusItem.org_id"
-              v-for="(statusItem, index) in diaMyOrgList"
-            ></el-option>
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="教材描述" label-width="90px" prop="description">
-          <el-input type="textarea" v-model="formDialog.description"></el-input>
+          <el-input v-model="formDialog.description" type="textarea" />
         </el-form-item>
         <!-- <el-form-item label="发布状态" label-width="90px">
                     <el-radio label="0" v-model="formDialog.publish_status">下架</el-radio>
                     <el-radio label="1" v-model="formDialog.publish_status">上架</el-radio>
                 </el-form-item>-->
         <el-form-item label="发布范围" label-width="90px" prop="publish_scope">
-          <el-radio :label="0" v-model="formDialog.publish_scope"
+          <el-radio v-model="formDialog.publish_scope" :label="0"
             >机构内用户可见</el-radio
           >
-          <el-radio :label="1" v-model="formDialog.publish_scope"
+          <el-radio v-model="formDialog.publish_scope" :label="1"
             >所有用户可见</el-radio
           >
         </el-form-item>
+        <el-form-item label="主题颜色" label-width="90px" prop="theme_color">
+          <el-radio v-model="formDialog.theme_color" label="red">红色</el-radio>
+          <el-radio v-model="formDialog.theme_color" label="green"
+            >绿色</el-radio
+          >
+          <el-radio v-model="formDialog.theme_color" label="brown"
+            >棕色</el-radio
+          >
+        </el-form-item>
         <el-form-item label="教材图片" label-width="90px" prop="fileList">
           <el-upload
             :action="url"
@@ -339,9 +344,9 @@
           </el-upload>
         </el-form-item>
       </el-form>
-      <div class="dialog-footer" slot="footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFlag = false">取 消</el-button>
-        <el-button :loading="loading" @click="submitCourse" type="primary"
+        <el-button :loading="loading" type="primary" @click="submitCourse"
           >确 定</el-button
         >
       </div>
@@ -413,6 +418,7 @@ export default {
         picture_id: "",
         id: "",
         publisher: "",
+        theme_color: "",
         type_id: "",
       },
       agencyList: [
@@ -587,6 +593,7 @@ export default {
         picture_id: "",
         id: "",
         publisher: "",
+        theme_color: "",
         type_id: "",
       };
       this.agency = "";
@@ -830,6 +837,7 @@ export default {
             series_code: res.series_code,
             publisher: res.publisher,
             edition: res.edition,
+            theme_color: res.theme_color,
             type_id: res.type_id,
           };
           if (res.picture_url) {