Merge branch 'release/6.9.10' into 'master'

Release/6.9.10



See merge request !1782

@@ -485,6 +485,41 @@ const shopIntro = (req, res, next) => {
 };
 };
 
 
 /**
 /**
+ * 营业执照简介
+ * @param req
+ * @param res
+ * @param next
+ */
+const shopLicense = (req, res, next) => {
+    let shopId = req.query.shop_id;
+    let appVersion = req.body.appVersion || false;
+    let params = {};
+
+    if (parseInt(shopId, 10)) {
+        req.ctx(listModel).getShopIntro(shopId).then(result => {
+            if (appVersion) {
+                params = {
+                    title: '证照信息'
+                };
+            } else {
+                params = {
+                    pageHeader: headerModel.setNav({
+                        navTitle: '证照信息'
+                    })
+                };
+            }
+
+            res.render('shop/license', _.assign(params, result, {
+                module: 'product',
+                page: 'license'
+            }));
+        }).catch(next);
+    } else {
+        res.redirect('/?go=1');
+    }
+};
+
+/**
  * 品牌[店铺]收藏/取消收藏
  * 品牌[店铺]收藏/取消收藏
  * id 品牌ID
  * id 品牌ID
  * opt 操作标识("ok":表示收藏,"cancel":表示取消收藏)
  * opt 操作标识("ok":表示收藏,"cancel":表示取消收藏)
@@ -604,6 +639,7 @@ module.exports = {
     brand,
     brand,
     favoriteBrand,
     favoriteBrand,
     shopIntro,
     shopIntro,
+    shopLicense,
     brandFav,
     brandFav,
     shopAppCookie,
     shopAppCookie,
     shopFav,
     shopFav,

@@ -192,6 +192,7 @@ router.get('/index/getShopCouponsList', cors, newShop.getShopCouponsList);
 router.post('/index/userCoupon', cors, newShop.userCoupon);
 router.post('/index/userCoupon', cors, newShop.userCoupon);
 router.get('/red-shop', newShop.redShop); // 红人店铺
 router.get('/red-shop', newShop.redShop); // 红人店铺
 router.get('/index/intro', list.shopIntro); // 店铺介绍
 router.get('/index/intro', list.shopIntro); // 店铺介绍
+router.get('/index/license', list.shopLicense); // 营业执照信息
 router.get('/opt/favoriteBrand', list.favoriteBrand); // 品牌|店铺收藏|取消收藏
 router.get('/opt/favoriteBrand', list.favoriteBrand); // 品牌|店铺收藏|取消收藏
 router.get('/index/allBrand', newShop.allBrand); // 店铺全部品牌
 router.get('/index/allBrand', newShop.allBrand); // 店铺全部品牌
 
 

@@ -11,4 +11,15 @@
         <span class="iconfont">&#xe649;</span>
         <span class="iconfont">&#xe649;</span>
         100%品牌授权正品
         100%品牌授权正品
     </p>
     </p>
+
+    {{#ifcond shop_sell_type '===' 200}}
+        {{#ifcond shop_sell_type_name '===' '专营'}}
+            <a class="license" href="/product/index/license?shop_id={{shops_id}}">
+                <p class="license-style">
+                    网上营业者营业执照信息
+                </p>
+            </a>
+        {{/ifcond}}
+    {{/ifcond}}
+
 </div>
 </div>

+<div class="shop-introduce-page">
+
+    <div class="license-description">
+        {{{business_license}}}
+    </div>
+
+</div>

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.9.9-10",
+  "version": "6.9.10-2",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

+/**
+ * Created by yoho on 2019/08/07.
+ */
+require('js/common');

@@ -32,6 +32,29 @@
     .sign-icon > span {
     .sign-icon > span {
         width: auto;
         width: auto;
     }
     }
+
+    .license {
+        width: auto;
+        display: block;
+        overflow: hidden;
+    }
+
+    .license-style {
+        font-size: 24px;
+        color: #444;
+        height: 50px;
+        line-height: 50px;
+        text-align: center;
+        max-width: 300px;
+        margin: auto;
+        margin-top: 10px;
+        margin-bottom: 30px;
+        border: 1px solid #e0e0e0;
+    }
+
+    .license-description {
+        margin: 0 auto;
+    }
 }
 }
 
 
 .brand-shop-page {
 .brand-shop-page {