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

src/pages/assistingAgriculture/order/detail.vue

@@ -9,7 +9,7 @@
     ></web-view>
     <!-- <view style="height: 600rpx; background-color: aquamarine"></view> -->
     <view class="content" v-if="orderDetail">
-      <view class="info">
+      <view class="info" :style="{ 'padding-top': logisticsDetail ? '30rpx' : '60rpx' }">
         <view class="top" v-if="logisticsDetail">
           <view class="left">
             <image
@@ -711,7 +711,7 @@ page {
               background: #f12a2a;
               border-radius: 50%;
               position: absolute;
-              top: 6rpx;
+              top: -14rpx;
               z-index: 1;
             }
 
@@ -721,7 +721,7 @@ page {
               background: #ffd5d5;
               border-radius: 50%;
               position: absolute;
-              top: 6rpx;
+              top: -14rpx;
               z-index: 1;
             }
 
@@ -729,8 +729,8 @@ page {
               height: 100%;
               width: 2rpx;
               background-color: #ffd5d5;
-              position: absolute;
-              top: 6rpx;
+              // position: absolute;
+              // top: 6rpx;
             }
           }
 

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;

src/pages/ticket/ticket.vue

@@ -121,10 +121,21 @@
 
 <script setup>
 import { myCouponListApi, userCouponStatisticsApi } from '@/api/ticket';
+import { signIn } from '@/utils/signIn';
 import Header from '@/pages/order/components/Header/index.vue';
 
+import testJson from '@/static/json/test.json';
+import { getTokenUser } from '@/api/index';
+import { getToken } from '@/utils/auth';
 const fileDomain = import.meta.env.VITE_APP_IMG_URL;
 
+onLoad(async () => {
+  if (!getToken()) await signIn();
+  // if (!getToken()) await signIn2();
+  getStatistics();
+  getCouponList();
+});
+
 // 优惠券状态 0:失效 2:已使用,3-未使用
 const iconUrl = ref({
   0: '@/static/ticket/past-icon.png',
@@ -173,7 +184,6 @@ const getStatistics = async () => {
     discountAmount.value = res.data;
   }
 };
-getStatistics();
 
 /**
  * 获取用户优惠券列表
@@ -213,7 +223,21 @@ const getCouponList = async () => {
   // state.value = 'finished';
   xma.hideLoading();
 };
-getCouponList();
+
+// 登录
+const signIn2 = () => {
+  xma.showLoading({
+    title: '加载中',
+    mask: true,
+  });
+  return getTokenUser(testJson).then((res) => {
+    const token = res.data.access_token;
+    const userInfo = res.data.user_info;
+    xma.setStorageSync('Authorization', token);
+    xma.setStorageSync('userInfo', userInfo);
+    console.log('登录...');
+  });
+};
 
 // 下拉刷新
 onPullDownRefresh(() => {

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"