Merge branch 'release-3.1.0' into lock/release-3.1.0/KIP-13638-2

src/common/js/BaseDictionary.js

@@ -173,6 +173,30 @@ const NANCHANG = {
   },
 }
 
+// 深圳-深圳嘉里建设广场
+const SZXP = {
+  dev: {
+    ...testAppIdInfo,
+    groupId: '8a84819f7c6e260e017c72669bbe01c2',
+    mallId: '8a8486d58c0e78e0018c1540374d0002',
+    projectId: 'NCHC',
+  },
+  qa: {
+    ...testAppIdInfo,
+    groupId: '8a84819f7c6e260e017c72669bbe01c2',
+    mallId: '8a8486d58c0e78e0018c1540374d0002',
+    projectId: 'SZXP',
+  },
+  prod: {
+    // TODO: 等待对应公众号上线
+    ...testAppIdInfo,
+    // TODO: 获取生产环境的 groupId和mallId
+    groupId: '8a888caf8809f52401880ea8c3fe0005',
+    mallId: '8a88817a8a629b5f018a838a0f6e001f',
+    projectId: 'SZXP',
+  },
+}
+
 export const lbsDictionary = {
   // 沈阳
   '8aaa87bc7ce98224017ce995fd8a0002': {
@@ -245,6 +269,11 @@ export const lbsDictionary = {
   "8a88817a8a629b5f018a838a0f6e001f": {
     ...NANCHANG
   },
+  // 深圳建设广场
+  "8a84819f7c6e260e017c7f27940401ce": {
+    ...SZXP
+  }
+
 };
 
 // 订单状态枚举数据

src/pages/parkingFee/parkingFee.vue

@@ -677,6 +677,10 @@ export default {
             margin: 0;
           }
         }
+        .ql-editor {
+          width: 100%;
+          padding-left: 2vw;
+        }
 
         .info_show {
           height: 150px;

src/pages/parkingFee/parkingFeeDetail.vue

@@ -292,7 +292,7 @@ export default {
 
 .description-box {
   padding-left: 30px;
-
+  padding-right: 30px;
   .title_box {
     padding-bottom: 10px;
     .title {

src/pages/parkingFeeV2/parkingFee.vue

@@ -123,7 +123,7 @@
                 <div class="no-car-unlicensed-info">未查询到无牌车信息</div>
                 <div class="search-btn no-car-unlicensed-btn" @click="scanCarCode">
                   <!-- <van-icon name="scan" />扫描进场二维码领取无牌车号牌 -->
-                  <img class="unlicensed-scan" :src="`${require(`@/pages/parkingFee/static/images/unlicensed-scan.png`)}`" /><sapn class="text">扫描进场二维码领取无牌车号牌</sapn>
+                  <img class="unlicensed-scan" :src="`${require(`@/pages/parkingFee/static/images/unlicensed-scan.png`)}`" /><span class="text">扫描进场二维码领取无牌车号牌</span>
                 </div>
               </div>
               <!-- 有无牌车 -->
@@ -760,6 +760,7 @@ export default {
           color: #898989;
           text-align: left;
         }
+        
 
         .title_box {
           display: flex;
@@ -799,6 +800,10 @@ export default {
             margin: 0;
           }
         }
+        .ql-editor {
+          width: 100%;
+          padding-left: 2vw;
+        }
 
         .info_show {
           height: 150px;

src/pages/parkingFeeV2/parkingFeeDetail.vue

@@ -292,7 +292,7 @@ export default {
 
 .description-box {
   padding-left: 30px;
-
+  padding-right: 30px;
   .title_box {
     padding-bottom: 10px;
     .title {

src/utils/index.js

@@ -198,6 +198,14 @@ export function initEnv() {
     window.wechatOfficialAccountId = 'wxb81a622ed6d60adf'
     return;
   }
+  if ( origin.indexOf('https://dev-') > -1) {
+    window.env = 'dev';
+    window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
+    window.cmrApi = 'https://dev-crm.kerryplus.com/xcrm-api/api';
+    window.api = 'devApi';
+    window.wechatOfficialAccountId = 'wxb81a622ed6d60adf'
+    return;
+  }
   if ( origin.indexOf('https://qa-') > -1 ) {
     window.env = 'qa';
     window.api = 'qaApi';