优惠价格改为非必填

src/App.vue

@@ -56,6 +56,39 @@ export default {
                 });
             this.$store.commit('setOrgTypeAll',typeListAlls)   
             this.$store.commit('setOrgType',typeLists)
+            let provinceCityListAll = [{
+                label: '全部',
+                value: 0,
+                leaf: true
+            }]
+            let provinceCityList = []
+            await getLogin('/OrgServer/DictManager/GetAllProvinceCityList', {})
+                .then((res) => {
+                    if (res.status === 1) {
+                        res.province_list.forEach(item => {
+                            let obj = {
+                                label: item.name,
+                                value: item.id,
+                                children: []
+                            }
+                            item.city_list.forEach(items=>{
+                                let objs = {
+                                    label: items.name,
+                                    value: items.id,
+                                    leaf: true
+                                }
+                                obj.children.push(objs)
+                            })
+                            provinceCityList.push(obj)
+                            provinceCityListAll.push(obj)
+                        });
+                    }
+                })
+                .catch(() => {
+
+                });
+            this.$store.commit('setProviceCity',provinceCityList)
+            this.$store.commit('setProviceCityAll',provinceCityListAll)
         }
     }         
   },

src/store/index.js

@@ -58,6 +58,8 @@ const store = new Vuex.Store({
             }
         },
         file_preview_url: 'https://docpreview.utschool.cn',
+        $provinceCityListAll: [],
+        $provinceCityList: []
     },
     mutations: {
         setStudyTypeAll(state, data) {
@@ -72,6 +74,12 @@ const store = new Vuex.Store({
         setOrgType(state, data) {
             state.$orgType = data
         },
+        setProviceCityAll(state, data) {
+            state.$provinceCityListAll = data
+        },
+        setProviceCity(state, data) {
+            state.$provinceCityList = data
+        }
     },
     modules: {
         app,

src/utils/defined.js

@@ -1,5 +1,7 @@
 export const cutMoneyFiter = (amount) => {
-    if (!amount) {
+    if (amount === 0) {
+        // return "0"
+    } else if (!amount) {
         return "-"
     }
     //强制保留两位小数

src/views/content_manage/course_manage/CreateLive.vue

@@ -73,9 +73,14 @@
                         <el-input-number v-model="organizeForm.price" @change="handleChange" :min="0" size="small" :precision="2" class="personal-ceil"></el-input-number>
                         <span class="prepend">￥</span>
                         <span class="append">元</span>
-                        <p class="tips">&#160; </p>
                     </el-form-item>
-                    <el-form-item label="优惠价格" prop="currentPrice" class="price-box">
+                    <el-form-item label="优惠价格" prop="comb_flag">
+                        <el-radio-group v-model="organizeForm.has_discount">
+                            <el-radio :label="0">没有</el-radio>
+                            <el-radio :label="1">有</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="优惠价格" prop="currentPrice" class="price-box" v-if="organizeForm.has_discount===1">
                         <el-input-number v-model="organizeForm.currentPrice" @change="handleChange" :min="0" size="small" :precision="2" class="personal-ceil"></el-input-number>
                         <span class="prepend">￥</span>
                         <span class="append">元</span>
@@ -171,7 +176,8 @@ export default {
             startData:'',
             liveLink:'',
             price:'',
-            currentPrice:''
+            currentPrice:'',
+            has_discount: 1
         },
         rulesOrganize:{
             title:[
@@ -227,10 +233,6 @@ export default {
             }
         }
     },
-    // 级联选择器
-    handleCity(value){
-        console.log(value)
-    },
     changeIcon(flag){
         this[flag] = !this[flag]
     },
@@ -304,7 +306,7 @@ export default {
             teacher_name_list:form.teacher,
             begin_time: form.startData,
             price: form.price,
-            price_discount: form.currentPrice,
+            price_discount: form.has_discount===1?form.currentPrice:form.price,
             url: form.liveLink
         }
         if(this.id){
@@ -361,6 +363,11 @@ export default {
                 form.teacher = res.zb_course.teacher_name_list
                 form.price = res.zb_course.price
                 form.currentPrice = res.zb_course.price_discount
+                if(res.zb_course.price===res.zb_course.price_discount){
+                    form.has_discount = 0
+                }else{
+                    form.has_discount = 1
+                }
                 form.liveLink = res.zb_course.url
                 form.startData = res.zb_course.begin_time
             }

src/views/content_manage/course_manage/CreateRecorded.vue

@@ -105,9 +105,14 @@
                         <el-input-number v-model="organizeForm.price" @change="handleChange" :min="0" size="small" :precision="2" class="personal-ceil"></el-input-number>
                         <span class="prepend">￥</span>
                         <span class="append">元</span>
-                        <p class="tips">&#160; </p>
                     </el-form-item>
-                    <el-form-item label="优惠价格" prop="currentPrice" class="price-box">
+                    <el-form-item label="优惠价格" prop="comb_flag">
+                        <el-radio-group v-model="organizeForm.has_discount">
+                            <el-radio :label="0">没有</el-radio>
+                            <el-radio :label="1">有</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="优惠价格" prop="currentPrice" class="price-box" v-if="organizeForm.has_discount===1">
                         <el-input-number v-model="organizeForm.currentPrice" @change="handleChange" :min="0" size="small" :precision="2" class="personal-ceil"></el-input-number>
                         <span class="prepend">￥</span>
                         <span class="append">元</span>
@@ -322,7 +327,8 @@ export default {
             tabs:[],
             intro:'',
             price:'',
-            currentPrice:''
+            currentPrice:'',
+            has_discount: 1
         },
         rulesOrganize:{
             title:[
@@ -658,7 +664,7 @@ export default {
             label_name_list: form.tabs,
             effective_month_count: form.validity*1,
             price: form.price,
-            price_discount: form.currentPrice,
+            price_discount: form.has_discount===1?form.currentPrice:form.price,
             intro: form.intro
         }
         if(this.id){
@@ -708,6 +714,11 @@ export default {
                 form.validity = res.lb_course.effective_month_count
                 form.price = res.lb_course.price
                 form.currentPrice = res.lb_course.price_discount
+                if(res.lb_course.price===res.lb_course.price_discount){
+                    form.has_discount = 0
+                }else{
+                    form.has_discount = 1
+                }
                 form.intro = res.lb_course.intro
             }
         })

src/views/content_manage/course_manage/LiveCourse.vue

@@ -65,7 +65,7 @@
                         sortable="custom">
                         <template slot-scope="scope">
                             <span class="currectPrice">￥{{scope.row.price_discount | cutMoneyFiter}}</span>
-                            <span class="oldPrice">(￥{{scope.row.price | cutMoneyFiter}})</span>
+                            <span class="oldPrice" v-if="scope.row.price!==scope.row.price_discount">(￥{{scope.row.price | cutMoneyFiter}})</span>
                         </template>
                     </el-table-column>
                     <el-table-column

src/views/content_manage/course_manage/RecordedCourse.vue

@@ -107,7 +107,7 @@
                         sortable="custom">
                         <template slot-scope="scope">
                             <span class="currectPrice">￥{{scope.row.price_discount | cutMoneyFiter}}</span>
-                            <span class="oldPrice">(￥{{scope.row.price | cutMoneyFiter}})</span>
+                            <span class="oldPrice" v-if="scope.row.price!==scope.row.price_discount">(￥{{scope.row.price | cutMoneyFiter}})</span>
                         </template>
                     </el-table-column>
                     <el-table-column

src/views/content_manage/newspaper_manage/CreateNewspaper.vue

@@ -97,7 +97,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="栏目模版" prop="chn_data">
+                        <el-form-item label="栏目模板" prop="chn_data">
                             <el-select v-model="newspaperForm.chn_data" filterable placeholder="请选择" @change="handleChangeChn">
                                 <el-option
                                     v-for="item in tplList"
@@ -106,7 +106,7 @@
                                     :value="item.chn_data_string">
                                 </el-option>
                             </el-select>
-                            <a @click="handleLinkChannel" class="tpl-maintain">栏目模版维护</a>
+                            <a @click="handleLinkChannel" class="tpl-maintain">栏目模板维护</a>
                             <br/>
                             <el-input
                                 type="textarea"
@@ -288,7 +288,7 @@ export default {
         id:this.$route.query.id?this.$route.query.id:'',
         stepIndex:0, // 步骤索引
         coverFlag: false,
-        newspaperForm:{
+        newspaperForm:window.localStorage.getItem('newsForm')?JSON.parse(window.localStorage.getItem('newsForm')):{
             cover_image_url: '',
             cover_image_list: [],
             cover_image_id: null,
@@ -400,6 +400,7 @@ export default {
     },
     // 跳转栏目列表
     handleLinkChannel(){
+        window.localStorage.setItem('newsForm',JSON.stringify(this.newspaperForm))
         this.$router.push({
             path:'/channelList'
         })
@@ -512,6 +513,7 @@ export default {
         getLogin(MethodName, data)
         .then((res) => {
             if(res.status===1){
+               window.localStorage.removeItem('newsForm')
                this.issueId = res.data.id
                this.stepIndex++
             }

src/views/content_manage/newspaper_manage/index.vue

@@ -328,6 +328,7 @@ export default {
         // 点击时记录页码和每页条数
         window.localStorage.setItem('pageSize',this.pageSize)
         window.localStorage.setItem('pageNumber',this.pageNumber)
+        window.localStorage.removeItem('newsForm')
         this.$router.push({
             path: "/createNewspaper",
             query: {