xiaoming_global 5 years ago
parent
commit
24156faa61
3 changed files with 10 additions and 13 deletions
  1. 2 2
      config/dev.env.js
  2. 1 6
      config/index.js
  3. 7 5
      src/scrm_pages/site/preview.vue

+ 2 - 2
config/dev.env.js View File

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

+ 1 - 6
config/index.js View File

16
     // can be overwritten by process.env.HOST
16
     // can be overwritten by process.env.HOST
17
     // if you want dev by ip, please set host: '0.0.0.0'
17
     // if you want dev by ip, please set host: '0.0.0.0'
18
 
18
 
19
-<<<<<<< .mine
20
     host: 'test1.sgjyun.com',
19
     host: 'test1.sgjyun.com',
21
-
22
-=======
23
-    //  host: 'test1.sgjyun.com',
24
-     host: 'microweb.kuyicloud.com',
25
->>>>>>> .theirs
20
+    //  host: 'microweb.kuyicloud.com',
26
     // host: 'localhost',
21
     // host: 'localhost',
27
     // host: 'jk.kuyicloud.com',
22
     // host: 'jk.kuyicloud.com',
28
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
23
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

+ 7 - 5
src/scrm_pages/site/preview.vue View File

1110
 
1110
 
1111
                 <!-- 编辑导航 -->
1111
                 <!-- 编辑导航 -->
1112
                 <el-dialog
1112
                 <el-dialog
1113
-                  title="编辑导航"
1113
+                  title="编辑导航4"
1114
                   :visible.sync="editNavigationVisible"
1114
                   :visible.sync="editNavigationVisible"
1115
                   width="30%"
1115
                   width="30%"
1116
                  center>
1116
                  center>
1130
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
1130
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
1131
                        </el-upload>
1131
                        </el-upload>
1132
                     </el-form-item>
1132
                     </el-form-item>
1133
-                    <!-- <el-form-item label="导航图标未选中:">
1134
-                       <el-upload
1133
+
1134
+                    <el-form-item label="导航图标未选中:">
1135
+                       <!-- <el-upload
1135
                         :data="editcheckdata"
1136
                         :data="editcheckdata"
1136
                         class="avatar-uploader"
1137
                         class="avatar-uploader"
1137
                         action="https://upload.qiniup.com"
1138
                         action="https://upload.qiniup.com"
1140
                         :before-upload="editNaviAvatarUploadone">
1141
                         :before-upload="editNaviAvatarUploadone">
1141
                         <img v-if="editNavigationform.noCheckImages" :src="editNavigationform.noCheckImages" class="avatar">
1142
                         <img v-if="editNavigationform.noCheckImages" :src="editNavigationform.noCheckImages" class="avatar">
1142
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
1143
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
1143
-                       </el-upload>
1144
-                    </el-form-item> -->
1144
+                       </el-upload> -->
1145
+                    </el-form-item>
1146
+
1145
                     <el-form-item label="跳转设置:">
1147
                     <el-form-item label="跳转设置:">
1146
                         <el-radio-group v-model="editNavigationform.jumpset">
1148
                         <el-radio-group v-model="editNavigationform.jumpset">
1147
                           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>
1149
                           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>