Merge branch 'feature/zmj' of http://git.nyinhong.com/zhengyunfei/xinrenli-admin into feature_lyj

.env.staging

+# 页面标题
+VUE_APP_TITLE = 康巴赫智能终端系统
+
+NODE_ENV = production
+
+# 测试环境配置
+ENV = 'staging'
+
+# 康巴赫智能终端系统/测试环境
+VUE_APP_BASE_API = '/stage-api'
+
+# 应用访问路径 例如使用前缀 /admin/
+VUE_APP_CONTEXT_PATH = '/'

package.json

@@ -7,6 +7,7 @@
   "scripts": {
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
     "lint": "eslint --ext .js,.vue src"
   },
   },

src/views/dynamic/components/modify.vue

@@ -6,7 +6,7 @@
           <el-input v-model="form.name"></el-input>
           <el-input v-model="form.name"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="动态内容" prop="desc">
         <el-form-item label="动态内容" prop="desc">
-          <Editor></Editor>
+          <Editor  v-model="currentInfo.content" :height="300"></Editor>
 
 
         </el-form-item>
         </el-form-item>
         <el-form-item label="添加图片" class="customer" prop="name">
         <el-form-item label="添加图片" class="customer" prop="name">
@@ -50,6 +50,7 @@ export default {
         name: '',
         name: '',
         desc: ''
         desc: ''
       },
       },
+      currentInfo:{},
       rules: {
       rules: {
         name: [
         name: [
           { required: true, message: '请输入活动名称', trigger: 'blur' },
           { required: true, message: '请输入活动名称', trigger: 'blur' },
@@ -62,6 +63,11 @@ export default {
     };
     };
   },
   },
   created() { },
   created() { },
+  watch:{
+    currentInfo(sta,val){
+      console.log(sta,val,'kllllllllllllll')
+    }
+  },
   methods: {
   methods: {
     dialog() {
     dialog() {
       this.$emit('diaisibl')
       this.$emit('diaisibl')

src/views/dynamic/index.vue

@@ -67,6 +67,7 @@ export default {
       dialogVi: false,
       dialogVi: false,
       control: 0,
       control: 0,
       total: 5,
       total: 5,
+      value1:'',
       title: '修改订单',
       title: '修改订单',
       options: [{
       options: [{
         value: '选项1',
         value: '选项1',