提交

config/dev.env.js

@@ -1,8 +1,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  // BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
-  BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
+  BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
+  // BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
   
   //  SSO_HOST: '"http://testsso.sgjyun.com"',
   //  SRCM_HOST: '"http://test1.sgjyun.com"',

config/index.js

@@ -16,13 +16,8 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-<<<<<<< .mine
     host: 'test1.sgjyun.com',
-
-=======
-    //  host: 'test1.sgjyun.com',
-     host: 'microweb.kuyicloud.com',
->>>>>>> .theirs
+    //  host: 'microweb.kuyicloud.com',
     // host: 'localhost',
     // host: 'jk.kuyicloud.com',
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

src/scrm_pages/site/preview.vue

@@ -1110,7 +1110,7 @@
 
                 <!-- 编辑导航 -->
                 <el-dialog
-                  title="编辑导航"
+                  title="编辑导航4"
                   :visible.sync="editNavigationVisible"
                   width="30%"
                  center>
@@ -1130,8 +1130,9 @@
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                        </el-upload>
                     </el-form-item>
-                    <!-- <el-form-item label="导航图标未选中:">
-                       <el-upload
+
+                    <el-form-item label="导航图标未选中:">
+                       <!-- <el-upload
                         :data="editcheckdata"
                         class="avatar-uploader"
                         action="https://upload.qiniup.com"
@@ -1140,8 +1141,9 @@
                         :before-upload="editNaviAvatarUploadone">
                         <img v-if="editNavigationform.noCheckImages" :src="editNavigationform.noCheckImages" class="avatar">
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                       </el-upload>
-                    </el-form-item> -->
+                       </el-upload> -->
+                    </el-form-item>
+
                     <el-form-item label="跳转设置:">
                         <el-radio-group v-model="editNavigationform.jumpset">
                           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>