From ea36d4c872868796f7a92025988b53f36c58bd96 Mon Sep 17 00:00:00 2001
From: freechen <ym51777@qq.com>
Date: Thu, 24 May 2018 08:22:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E8=A7=84=E6=A0=BC=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改规格编辑时，规格描述不显示
---
 application/store/view/goods_spec/form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/store/view/goods_spec/form.html b/application/store/view/goods_spec/form.html
index 9d60ff2e2..1d4160890 100644
--- a/application/store/view/goods_spec/form.html
+++ b/application/store/view/goods_spec/form.html
@@ -70,7 +70,7 @@
                 // 属性参数
                 $rootScope.paramList = filterParamList(JSON.parse('{$vo.spec_param|default="[]"|raw}') || []);
                 $rootScope.spec_title = '{$vo.spec_title|default=""}';
-                $rootScope.spec_desc = '{$vo.sepc_desc|default=""}';
+                $rootScope.spec_desc = '{$vo.spec_desc|default=""}';
 
                 // 删除菜单
                 $rootScope.delParam = function (x) {

From 72781b467e2421667de5370c37acf5e7b943c773 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 28 May 2018 14:43:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=A0unionid=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8=20Closed#1?=
 =?UTF-8?q?16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/view/api/tools/oauth.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/wechat/view/api/tools/oauth.html b/application/wechat/view/api/tools/oauth.html
index f16bc3016..086bdfc2d 100644
--- a/application/wechat/view/api/tools/oauth.html
+++ b/application/wechat/view/api/tools/oauth.html
@@ -38,7 +38,7 @@
     </div>
     <div class="weui-cell">
         <div class="weui-cell__bd">UNIONID</div>
-        <div class="weui-cell__ft" style="font-size:0.6rem">{$fans.fansinfo.unionid}</div>
+        <div class="weui-cell__ft" style="font-size:0.6rem">{$fans.fansinfo.unionid|default='未获取到'}</div>
     </div>
 </div>
 <div class="weui-cells__title">详细资料</div>