v6.8.0商店信息文字优化

app/admin/view/default/config/store.html

@@ -32,23 +32,6 @@
                         <label>{{$data.common_customer_store_describe.name}}<span class="am-form-group-label-tips">{{$data.common_customer_store_describe.describe}}</span></label>
                         <input type="text" name="{{$data.common_customer_store_describe.only_tag}}" placeholder="{{$data.common_customer_store_describe.name}}" data-validation-message="{{$data.common_customer_store_describe.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_customer_store_describe.value}}"{{/if}} />
                     </div>
-                    <div class="am-form-group">
-                        <label class="am-block">{{$data.common_customer_store_public_weixin.name}}<span class="am-form-group-label-tips">{{$data.common_customer_store_public_weixin.describe}}</span></label>
-                        <div class="am-form-file-upload-container">
-                            <ul class="plug-file-upload-view common_customer_store_public_weixin-images-view" data-form-name="common_customer_store_public_weixin" data-max-number="1" data-dialog-type="images" data-is-eye="1">
-                                <li class="plug-file-upload-submit" data-view-tag="ul.common_customer_store_public_weixin-images-view">
-                                    {{if empty($data['common_customer_store_public_weixin']['value'])}}
-                                        <i class="iconfont icon-add"></i>
-                                    {{else /}}
-                                        <input type="text" name="common_customer_store_public_weixin" value="{{$data.common_customer_store_public_weixin.value}}" />
-                                        <img src="{{:AttachmentPathViewHandle($data.common_customer_store_public_weixin.value)}}" />
-                                        <i class="iconfont icon-close"></i>
-                                        <i class="iconfont icon-eye"></i>
-                                    {{/if}}
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
                     <div class="am-form-group">
                         <label class="am-block">{{$data.common_customer_store_public_alipay.name}}<span class="am-form-group-label-tips">{{$data.common_customer_store_public_alipay.describe}}</span></label>
                         <div class="am-form-file-upload-container">
@@ -66,6 +49,23 @@
                             </ul>
                         </div>
                     </div>
+                    <div class="am-form-group">
+                        <label class="am-block">{{$data.common_customer_store_public_weixin.name}}<span class="am-form-group-label-tips">{{$data.common_customer_store_public_weixin.describe}}</span></label>
+                        <div class="am-form-file-upload-container">
+                            <ul class="plug-file-upload-view common_customer_store_public_weixin-images-view" data-form-name="common_customer_store_public_weixin" data-max-number="1" data-dialog-type="images" data-is-eye="1">
+                                <li class="plug-file-upload-submit" data-view-tag="ul.common_customer_store_public_weixin-images-view">
+                                    {{if empty($data['common_customer_store_public_weixin']['value'])}}
+                                        <i class="iconfont icon-add"></i>
+                                    {{else /}}
+                                        <input type="text" name="common_customer_store_public_weixin" value="{{$data.common_customer_store_public_weixin.value}}" />
+                                        <img src="{{:AttachmentPathViewHandle($data.common_customer_store_public_weixin.value)}}" />
+                                        <i class="iconfont icon-close"></i>
+                                        <i class="iconfont icon-eye"></i>
+                                    {{/if}}
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
                 </div>
                 <!-- 客服 -->
                 <div class="item" data-key="chat">

app/index/controller/Common.php

@@ -240,8 +240,6 @@ class Common extends BaseController
 
         // 商店信息
         $assign['site_info_data'] = ResourcesService::SiteInfoData();
-        //print_r($assign['site_info_data']);
-
         $assign['common_customer_store_chat_tel'] = MyC('common_customer_store_chat_tel');
         $assign['common_customer_store_chat_email'] = MyC('common_customer_store_chat_email');
         $assign['common_customer_store_address'] = MyC('common_customer_store_address');

app/lang/cht.php

@@ -4023,12 +4023,12 @@ return [
             'desc' => '空白則不展示',
         ],
         'common_customer_store_public_alipay'  => [
-            'name' => '支付寶公眾號',
+            'name' => '生活號',
-            'desc' => '空白則不展示',
+            'desc' => '空白則不顯示',
         ],
         'common_customer_store_public_weixin'  => [
-            'name' => '微信生活號',
+            'name' => '公眾號',
-            'desc' => '空白則不展示',
+            'desc' => '空白則不顯示',
         ],
         'common_customer_store_platform_client'  => [
             'name' => '平台用戶端',

app/lang/en.php

@@ -4034,12 +4034,12 @@ return [
             'desc' => 'Not displayed if empty',
         ],
         'common_customer_store_public_alipay'  => [
-            'name' => 'Alipay Official Account',
+            'name' => 'Alipay Life Account',
-            'desc' => 'Not displayed if empty',
+            'desc' => 'Do not display if empty',
         ],
         'common_customer_store_public_weixin'  => [
-            'name' => 'WeChat Life Account',
+            'name' => 'WeChat Official Account',
-            'desc' => 'Not displayed if empty',
+            'desc' => 'Do not display if empty',
         ],
         'common_customer_store_platform_client'  => [
             'name' => 'Platform Client',

app/lang/spa.php

@@ -4024,12 +4024,12 @@ return [
             'desc' => 'No se muestra si está vacío',
         ],
         'common_customer_store_public_alipay'  => [
-            'name' => 'Cuenta Oficial de Alipay',
+            'name' => 'Canal de Vida',
-            'desc' => 'No se muestra si está vacío',
+            'desc' => 'No mostrar si está vacío',
         ],
         'common_customer_store_public_weixin'  => [
-            'name' => 'Cuenta de Vida de WeChat',
+            'name' => 'Cuenta Oficial',
-            'desc' => 'No se muestra si está vacío',
+            'desc' => 'No mostrar si está vacío',
         ],
         'common_customer_store_platform_client'  => [
             'name' => 'Cliente de la Plataforma',

app/lang/zh.php

@@ -4055,11 +4055,11 @@ return [
             'desc' => '空则不展示',
         ],
         'common_customer_store_public_alipay'  => [
-            'name' => '公众号',
+            'name' => '生活号',
             'desc' => '空则不展示',
         ],
         'common_customer_store_public_weixin'  => [
-            'name' => '生活号',
+            'name' => '公众号',
             'desc' => '空则不展示',
         ],
         'common_customer_store_platform_client'  => [

app/service/ResourcesService.php

@@ -542,18 +542,18 @@ class ResourcesService
                 ];
             }
         }
-        // 基础（公众号、生活号）
+        // 基础（生活号、公众号）
         $base_qrcode_arr = [
-            [
-                'name'  => MyLang('public_account_title'),
-                'key'   => 'public_weixin',
-                'icon'  => 'icon-wechart'
-            ],
             [
                 'name'  => MyLang('life_account_title'),
                 'key'   => 'public_alipay',
                 'icon'  => 'icon-life'
             ],
+            [
+                'name'  => MyLang('public_account_title'),
+                'key'   => 'public_weixin',
+                'icon'  => 'icon-wechart'
+            ],
         ];
         foreach($base_qrcode_arr as $v)
         {