Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/pages/storeEntry/detail.vue

@@ -391,7 +391,17 @@ onLoad((options) => {
   }
   getShopCategoryFun();
 });
-
+onUnload(() => {
+  try {
+    const value = xma.getStorageSync('storage_choosedShopInfo');
+    if (value && JSON.parse(value).length > 0) {
+      console.log('hhh');
+      xma.removeStorageSync('storage_choosedShopInfo');
+    }
+  } catch (e) {
+    // error
+  }
+});
 // 获取店铺入驻分类（弹窗tree）
 const getShopCategoryFun = async () => {
   const res = await sgyrShopCategory();
@@ -679,7 +689,7 @@ const submitData = () => {
           });
         }
         try {
-          xma.setStorageSync('storage_choosedShopInfo', {});
+          xma.removeStorageSync('storage_choosedShopInfo');
           xma.showToast({
             title: '修改成功',
             icon: 'success',

src/pages/storeEntry/index.vue

@@ -123,7 +123,7 @@ const deleteShop = (shopId) => {
   min-height: calc(100vh - 160rpx);
 
   .content {
-  //  padding-top: 88rpx;
+    //  padding-top: 88rpx;
 
     .listcon {
       margin-top: 10px;

yarn.lock

@@ -6198,6 +6198,11 @@ xinhua-sdk@*:
   resolved "https://registry.npmmirror.com/xinhua-sdk/-/xinhua-sdk-1.6.1.tgz"
   integrity sha512-Pjhwgn6lme5MxA6EcXQLD7ZEZMUZWJ714yLJCOkwEW96Yr0oS2JItnJA4NNYUP2hQBqQLc9SAUrOn9QOpFcQdw==
 
+xinhua-sdk@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.npmmirror.com/xinhua-sdk/-/xinhua-sdk-1.8.0.tgz#a67fd21ed76f4489935cb5b4b0c9b8fde544da6b"
+  integrity sha512-5aXpi+zql1d+ojaERMtcgGZHsVEJAyKRctQJ8RlixPRa0jttBTTIaZaMXUzJtLxlnB82n4uhX/oJ8TNb65TbPA==
+
 xml-name-validator@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"