Merge branch 'master_edit_goods_30_2204' into test

# Conflicts:
#	dist/index.html

public/index.html

@@ -227,9 +227,9 @@
           }
         }
       };
-      // xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
+      xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
       // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
-      xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
+      // xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
       xhttp.send();
     }
   </script>

src/api/webSite.js

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

src/views/entry/newyuncang.vue

@@ -644,7 +644,11 @@
       // 获取渠道id
       getIndexInfo() {
         let op = 'open'
-        let ssa = window.location.host
+        if(window.location.hostname=='localhost'){
+          var ssa = 'www.stbz.net'
+        }else{
+          var ssa = window.location.host
+        }
         const data = {
           // domain: 'newsys.jxhh.com',
           domain: ssa,

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

@@ -9,7 +9,7 @@
 
       <el-form-item label='商品标题：' prop="goods_name">
         <el-input v-model="goodsInfoForm.goods_name" placeholder="请输入商品标题" style="width:420px;"></el-input>
-        <span class="tip-span ml20">商品名称限制在30字以内，不要填写与商品无关的词</span>
+        <span class="tip-span ml20">商品名称限制在50字以内，不要填写与商品无关的词</span>
       </el-form-item>
 
       <el-form-item label='商品关键词：' prop="goods_des">
@@ -177,7 +177,7 @@
           categoryStr: [{required: true, message: '商品分类不能为空', trigger: 'blur'}],
           goods_name: [
             {required: true, message: '请输入商品名称', trigger: 'blur'},
-            {min: 3, max: 30, message: '商品标题限制在3字符以上，30个字符以下', trigger: 'blur'}
+            {min: 3, max: 50, message: '商品标题限制在3字符以上，50个字符以下', trigger: 'blur'}
           ],
           // goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}],
           // producing_area:[{required: true, message: '请选择商品产地', trigger: 'change'}],