From dfd2b68aaa7af8cd52a1fcbf944527be57ba74be Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Wed, 12 Dec 2018 16:29:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=A4=9A=E4=B8=AA=E9=80=89=E6=8B=A9=E4=B8=8D=E8=B5=B7?=
 =?UTF-8?q?=E4=BD=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/model/store/StoreProductAttr.php | 2 +-
 view/crmebN/pages/product-con/index.wxml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/admin/model/store/StoreProductAttr.php b/application/admin/model/store/StoreProductAttr.php
index d685496b..910cb945 100644
--- a/application/admin/model/store/StoreProductAttr.php
+++ b/application/admin/model/store/StoreProductAttr.php
@@ -77,7 +77,7 @@ class StoreProductAttr extends ModelBasic
             ];
         }
         foreach ($valueList as $k=>$value){
-            ksort($value['detail'],SORT_STRING);
+            sort($value['detail'],SORT_STRING);
             $suk = implode(',',$value['detail']);
             $valueGroup[$suk] = [
                 'product_id'=>$productId,
diff --git a/view/crmebN/pages/product-con/index.wxml b/view/crmebN/pages/product-con/index.wxml
index f61f8452..fd8e9ff3 100644
--- a/view/crmebN/pages/product-con/index.wxml
+++ b/view/crmebN/pages/product-con/index.wxml
@@ -78,7 +78,7 @@
       <view class='txt-msg'>{{reply.comment}}</view>
       <view class='time-bar'>{{reply.add_time}}</view>
     </view>
-    <view>
+    <view wx:if="{{reply.merchant_reply_content != null}}">
        <view>管理员回复：</view>
       <view class='txt-msg'>{{reply.merchant_reply_content}}</view>
       <view class='time-bar'>{{reply.merchant_reply_time}}</view>