Merge branch 'master_1009' into test

# Conflicts:
#	dist/index.html
#	dist/static/js/app.6eef84e9.js

.env.development

@@ -2,11 +2,9 @@
 ENV = 'development'
 
 # 正式环境
-#VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
-VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
+VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
 # 开发环境
-#VUE_APP_BASE_API = 'http://192.168.111.34:8200'
-VUE_APP_BASE_API = 'http://192.168.26.179:8200'
+#VUE_APP_BASE_API = 'http://192.168.111.36:8200'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -2,5 +2,6 @@
 ENV = 'production'
 
 # gfast管理系统/生产环境
-#VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
-VUE_APP_BASE_API = 'http://192.168.26.179:8200'
\ No newline at end of file
+VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
+VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
+#VUE_APP_BASE_API = 'http://192.168.26.179:8200'

.env.staging

@@ -4,4 +4,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 #gfast管理系统/测试环境
-VUE_APP_BASE_API = 'http://192.168.26.179:8200'
+VUE_APP_BASE_API = '/stage-api'

src/api/webSite.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取渠道id
 export function indexInfo(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
     method: 'get',
     params
 
@@ -12,7 +12,7 @@ export function indexInfo(params) {
 // 获取所有域名
 export function getdomain(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
     method: 'get',
     params
 
@@ -21,7 +21,7 @@ export function getdomain(params) {
 // 获取官网设置接口
 export function webSite(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
     method: 'get',
     params
   })
@@ -30,7 +30,7 @@ export function webSite(params) {
 // 云仓所有列表——Banner和域名/产品和服务/供应商入驻
 export function getallCloudList(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
     method: 'get',
     params
   })

src/layout/components/Navbar.vue

@@ -5,7 +5,10 @@
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
     <div style="position:fixed;height: 100%;line-height: 50px;font-size:16px; right: 100px;">
-      <el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>
+<!--      <el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>-->
+      <el-tooltip class="item" effect="dark" content="查看历史订单及财务数据" placement="bottom-end">
+        <a href="http://oldpop.jxhh.com/" style="color:red;font-size:14px;">查看历史数据</a>
+      </el-tooltip>
     </div>
     <div class="right-menu">
      <!-- <template v-if="device!=='mobile'">

src/views/entry/newyuncang.vue

@@ -4,7 +4,7 @@
     <header :class="{ 'head-scroll': isScroll }">
       <div class="header-con">
         <ul class="nav">
-          <li v-if="settitle && settitle.toplogo">
+          <li v-if="settitle && settitle.topLogo">
             <img style="width:114px;height:35px;" :src="settitle.topLogo" alt="">
           </li>
           <li>
@@ -226,6 +226,11 @@
 <script>
   import store from '@/store';
   import {indexInfo, newsList, companyCounsel, webSite, getdomain, getallCloudList} from '@/api/webSite'
+  /** HACK
+   * 解决 swiper 轮播图不自动轮播问题
+   * */
+  import Swiper2,{Autoplay} from 'swiper';
+  Swiper2.use([Autoplay]);
 
   export default {
     name: "newyuncang",
@@ -270,7 +275,7 @@
             bulletActiveClass: 'my-bullet'
           },
           autoplay: {
-            delay: 6000,
+            delay: 4000,
             disableOnInteraction: false
           },
           // 设定初始化时slide的索引
@@ -670,16 +675,25 @@
   }
 
   .ad-details {
+    width:100%;
     padding: 30px;
     color: #333333;
     font-size: 16px;
     font-weight: 400;
     line-height: 28px;
+    word-wrap:break-word;
     text-align: justify;
     text-align-last: center;
     -ms-text-align-last: center;
     -moz-text-align-last: center;
   }
+  //.ad-details:after {
+  //  content: '';
+  //  display : inline-block;
+  //  overflow : hidden;
+  //  height:0;
+  //  width: 100%;
+  //}
 
   /* hover 时候的效果 class */
   .mgT20 {

src/views/platformlogin.vue

@@ -13,6 +13,7 @@
       gotosso() {
         var ticket = this.$route.query.ticket;
         this.$store.dispatch('Login', {"ticket": ticket}).then((res) => {
+          debugger
           if (res.token != "") {
             // 获取客户是否有审核信息
             getShopInf().then(res => {

src/views/system/asset/withdraw/index.vue

@@ -56,7 +56,7 @@
 
       <div class="footer-btn">
         <el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button>
-<!--        <el-button @click="resetAssetForm">取 消</el-button>-->
+        <!--        <el-button @click="resetAssetForm">取 消</el-button>-->
       </div>
     </el-card>
   </div>

src/views/system/goods/add/components/goodsinfomation.vue

@@ -379,6 +379,7 @@
             if(res.data) {
               urlObj.url = res.data.image_url;
               this.goodsImgFileList.push(urlObj);
+              this.goodsInfoForm.imgs = []; // 1009 hxz 初始化img
               this.goodsImgFileList.forEach(item=> {
                 this.goodsInfoForm.imgs.push(item.url)
               })

src/views/system/goods/add/index.vue

@@ -42,9 +42,9 @@
         <div class="floor-item">
           <div class="floor-item-box">
             <p class="card-header-title floor-item-box-title"><span class="blue-block-goods blue-block-goods-title"></span>商品售价</p>
-<!--            <keep-alive>-->
-              <GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" />
-<!--            </keep-alive>-->
+            <!--            <keep-alive>-->
+            <GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" />
+            <!--            </keep-alive>-->
           </div>
         </div>
         <!-- 商品详情 -->
@@ -243,16 +243,24 @@
             this.goodsaftersale.aftersale_time = res.data.aftersale_time;
             let stagArr = [];
 
+            // 后台返回数据格式 ‘2,3’或者‘[]’都是字符串，处理兼容一下
+            //debugger
             if( res.data.stags && !Array.isArray(res.data.stags)) {
               if( res.data.stags.indexOf(',') > -1 ) {
                 stagArr = res.data.stags.split(',');
                 stagArr.forEach(item => {
                   if (item) {
-                    this.goodsaftersale.stags.push(Number(item));
+                    if(Number(item)) {
+                      this.goodsaftersale.stags.push(Number(item));
+                    }
                   }
                 })
               }else {
-                this.goodsaftersale.stags.push( Number(res.data.stags) )
+                if(Number(res.data.stags)) {
+                  this.goodsaftersale.stags.push( Number(res.data.stags) )
+                }else {
+                  this.goodsaftersale.stags = [];
+                }
               }
             }else {
               this.goodsaftersale.stags = [];