li.shaoyi 2 rokov pred
rodič
commit
2eba3c13e6

+ 2 - 1
oem/gstj/config/appconfig.json

@@ -1,5 +1,6 @@
 {
   "version": "1.0.2",
   "versionCode": "100002",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "shwoRegister": true
 }

+ 2 - 1
oem/qdhs/config/appconfig.json

@@ -1,5 +1,6 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "shwoRegister": false
 }

+ 2 - 23
oem/qdhs/config/router.json

@@ -311,29 +311,8 @@
                             {
                                 "authType": 2,
                                 "sort": 1,
-                                "title": "日清挂牌",
-                                "code": "market_trade_goods_50101",
-                                "component": "views/market/trade/goods/list/index.vue"
-                            },
-                            {
-                                "authType": 2,
-                                "sort": 3,
-                                "title": "周清挂牌",
-                                "code": "market_trade_goods_50103",
-                                "component": "views/market/trade/goods/list/index.vue"
-                            },
-                            {
-                                "authType": 2,
-                                "sort": 4,
-                                "title": "月清挂牌",
-                                "code": "market_trade_goods_50104",
-                                "component": "views/market/trade/goods/list/index.vue"
-                            },
-                            {
-                                "authType": 2,
-                                "sort": 2,
-                                "title": "中远期挂牌",
-                                "code": "market_trade_goods_50102",
+                                "title": "青岛海商",
+                                "code": "market_trade_goods_50",
                                 "component": "views/market/trade/goods/list/index.vue"
                             }
                         ]

+ 2 - 1
oem/qxst/config/appconfig.json

@@ -1,5 +1,6 @@
 {
   "version": "1.0.5",
   "versionCode": "100005",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "shwoRegister": true
 }

+ 2 - 1
oem/sbyj/config/appconfig.json

@@ -1,5 +1,6 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://192.168.31.171:8080/cfg?key=test_171"
+  "apiUrl": "http://192.168.31.171:8080/cfg?key=test_171",
+  "shwoRegister": true
 }

+ 2 - 1
oem/tc/config/appconfig.json

@@ -1,5 +1,6 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "shwoRegister": true
 }

+ 2 - 1
oem/zrwyt/config/appconfig.json

@@ -1,5 +1,6 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "shwoRegister": true
 }

+ 2 - 1
public/config/appconfig.j2

@@ -1,5 +1,6 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "{apiUrl}"
+  "apiUrl": "{apiUrl}",
+  "shwoRegister": "{shwoRegister}",
 }

+ 2 - 1
public/config/appconfig.json

@@ -1,5 +1,6 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://192.168.31.134:8080/cfg?key=test_134"
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "shwoRegister": true
 }

+ 1 - 1
src/packages/mobile/views/user/login/Index.vue

@@ -16,7 +16,7 @@
       </div>
     </Form>
     <div class="login-link">
-      <span @click="navigationTo('user-register')">用户注册</span>
+      <span @click="navigationTo('user-register')" v-if="service.getSystemInfo('shwoRegister')">用户注册</span>
       <span @click="navigationTo('user-forget')">忘记密码</span>
     </div>
     <div class="login-footer">

+ 4 - 0
src/packages/mobile/views/user/login/index.less

@@ -68,6 +68,10 @@
         font-size: .26rem;
         padding: .28rem .48rem;
         margin: 0 .48rem;
+
+        span:only-child {
+            margin-left: auto;
+        }
     }
 
     &-footer {

+ 1 - 1
src/packages/pc/router/index.ts

@@ -73,7 +73,7 @@ router.beforeEach((to, from, next) => {
             }
         }
     } else {
-        if (to.name === 'boot' || to.name === 'login') {
+        if (to.name === 'boot') {
             next()
         } else {
             next({

+ 4 - 0
src/packages/pc/views/auth/login/index.less

@@ -5,5 +5,9 @@
         width: 100%;
         color: #666;
         cursor: pointer;
+
+        span:only-child{
+            margin-left: auto;
+        }
     }
 }

+ 1 - 1
src/packages/pc/views/auth/login/index.vue

@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item>
         <div class="text-link">
-          <span @click="click">立即注册</span>
+          <span @click="click" v-if="service.getSystemInfo('shwoRegister')">立即注册</span>
           <span @click="islogin = false">忘记密码?</span>
         </div>
       </el-form-item>

+ 3 - 0
src/packages/pc/views/market/trade/goods/list/index.vue

@@ -120,6 +120,9 @@ onResponse(() => {
 
 onMounted(() => {
     switch (props.code) {
+        case 'market_trade_goods_50':
+            setMarketId(50101, 50102, 50103, 50104)
+            break
         case 'market_trade_goods_50101':
             setMarketId(50101)
             break

+ 1 - 1
src/packages/qdhs/views/user/login/Index.vue

@@ -16,7 +16,7 @@
       </div>
     </Form>
     <div class="login-link">
-      <span @click="navigationTo('user-register')">用户注册</span>
+      <span @click="navigationTo('user-register')" v-if="service.getSystemInfo('shwoRegister')">用户注册</span>
       <span @click="navigationTo('user-forget')">忘记密码</span>
     </div>
     <div class="login-footer">

+ 4 - 0
src/packages/qdhs/views/user/login/index.less

@@ -68,6 +68,10 @@
         font-size: .26rem;
         padding: .28rem .48rem;
         margin: 0 .48rem;
+
+        span:only-child {
+            margin-left: auto;
+        }
     }
 
     &-footer {

+ 22 - 2
src/services/index.ts

@@ -2,6 +2,13 @@ import axios from 'axios'
 import plus from '@/utils/h5plus'
 
 export default new (class {
+    systemInfo = {
+        version: '1.0.0',
+        versionCode: '100000',
+        apiUrl: 'http://localhost',
+        shwoRegister: true
+    }
+
     /** 服务配置信息 */
     config = {
         commSearchUrl: '',
@@ -40,7 +47,7 @@ export default new (class {
     private isPending = false
 
     /**
-     * 自动初始化,若断网或其它原因导致初始化失败,需手动初始化
+     * 自动初始化,若断网或其它原因导致初始化失败,需重新初始化
      * IOS上架审核可能会遇到网络权限的情况,应用可能会在未授权网络权限的情况下发起请求,导致请求等待时间过长,最终审核被拒
      */
     //private onload = this.init()
@@ -92,8 +99,12 @@ export default new (class {
                 }
             }
             getAppConfig().then((res) => {
+                this.systemInfo = {
+                    ...this.systemInfo,
+                    ...res
+                }
                 // 获取服务接口地址
-                axios(res.apiUrl).then((res) => {
+                axios(this.systemInfo.apiUrl).then((res) => {
                     this.config = res.data.data
                     this.isReady = true
                     resolve(this.config)
@@ -126,4 +137,13 @@ export default new (class {
     getConfig<K extends keyof typeof this.config>(key: K) {
         return this.config[key]
     }
+
+    /**
+     * 获取系统信息
+     * @param key 
+     * @returns 
+     */
+    getSystemInfo<K extends keyof typeof this.systemInfo>(key: K) {
+        return this.systemInfo[key]
+    }
 })