diff --git a/src/pageB/select_product/index.vue b/src/pageB/select_product/index.vue
index aa48bb0..a83f5cc 100644
--- a/src/pageB/select_product/index.vue
+++ b/src/pageB/select_product/index.vue
@@ -301,9 +301,9 @@ export default {
   border-radius: 8rpx;
 }
 
-.class-item:last-child {
-  min-height: 100vh;
-}
+// .class-item:last-child {
+//   min-height: 100vh;
+// }
 
 .item-title {
   font-size: 26rpx;
diff --git a/src/pageB/svip/index.vue b/src/pageB/svip/index.vue
index c2bd06c..f4b78b9 100644
--- a/src/pageB/svip/index.vue
+++ b/src/pageB/svip/index.vue
@@ -1,25 +1,25 @@
 <template>
   <view>
-     <loading-view v-if="isFirstLoading"></loading-view>
-    <view class="bg-hex-303133 flex items-center justify-between  p-30rpx ">
+    <loading-view v-if="isFirstLoading"></loading-view>
+    <view class="bg-hex-303133 flex items-center justify-between p-30rpx">
       <view class="flex">
         <cu-avatar size="120" :src="user.avatar ? user.avatar : ''"></cu-avatar>
         <view class="ml-20rpx mt-10rpx">
-          <image :src="!user.is_vip?'/static/images/svip/vip_failure.png':'/static/images/svip/vip.png'" class="w-48rpx h-48rpx" mode=""></image>
+          <image :src="!user.is_vip ? '/static/images/svip/vip_failure.png' : '/static/images/svip/vip.png'" class="w-48rpx h-48rpx" mode=""></image>
           <view v-if="!user.is_vip" class="text-hex-f5f5f5 text-22rpx mt-10rpx">您暂未开通会员</view>
-          <view v-else class="text-hex-f5f5f5 text-22rpx mt-10rpx">vip到期日期：{{time}}</view>
+          <view v-else class="text-hex-f5f5f5 text-22rpx mt-10rpx">vip到期日期：{{ time }}</view>
         </view>
-      </view> 
+      </view>
       <view class="text-white flex items-center text-26rpx" @click="$u.route('/pageB/record/index')">
         <view class="mr-8rpx">购买记录</view>
-         <u-icon color="#ffffff" name="arrow-right" size="26"></u-icon>
+        <u-icon color="#ffffff" name="arrow-right" size="26"></u-icon>
       </view>
     </view>
     <!--  -->
     <view class="bg-white pb-40rpx">
-      <view class="p-30rpx text-32rpx ">尊享特权</view>
-      <view class="grid grid-cols-4  gap-30rpx">
-        <view class="flex items-center justify-center flex-col ">
+      <view class="p-30rpx text-32rpx">尊享特权</view>
+      <view class="grid grid-cols-4 gap-30rpx">
+        <view class="flex items-center justify-center flex-col">
           <view class="item">
             <image src="@/static/images/svip/vip_icon02.png" class="w-36rpx h-36rpx" mode="aspectFill"></image>
           </view>
@@ -32,15 +32,15 @@
           <view class="mt-20rpx text-24rpx">会员礼卷</view>
         </view>
         <view class="flex items-center justify-center flex-col">
-         <view class="item">
+          <view class="item">
             <image src="@/static/images/svip/vip_icon01.png" class="w-36rpx h-36rpx" mode="aspectFill"></image>
-         </view>
+          </view>
           <view class="mt-20rpx text-24rpx">会员特权</view>
         </view>
         <view class="flex items-center justify-center flex-col">
-         <view class="item">
+          <view class="item">
             <image src="@/static/images/svip/vip_icon04.png" class="w-36rpx h-36rpx" mode="aspectFill"></image>
-         </view>
+          </view>
           <view class="mt-20rpx text-24rpx">尊贵标识</view>
         </view>
       </view>
@@ -48,105 +48,111 @@
     <!--  -->
     <view class="bg-white mt-20rpx p-30rpx">
       <!--  -->
-      <view class="grid grid-cols-3  gap-30rpx">
-        <view @click="Index=index" :class="Index==index?'text-hex-f59e0b border-hex-f59e0b':'border-hex-F5F5F5'"
-          class="rounded-15rpx py-50rpx flex items-center justify-center flex-col border border-solid "
-          v-for="(item,index) in list" :key="index">
-          <view class="text-26rpx">{{item.name}}</view>
-          <view class="price-text text-34rpx font-medium mt-15rpx">{{item.price}}</view>
-          <view :class="Index==index?'text-hex-f59e0b':''" class="text-26rpx mt-15rpx text-hex-909399">{{item.times.text}}
-          </view>
+      <view class="grid grid-cols-3 gap-30rpx">
+        <view
+          @click="Index = index"
+          :class="Index == index ? 'text-hex-f59e0b border-hex-f59e0b' : 'border-hex-F5F5F5'"
+          class="rounded-15rpx py-50rpx flex items-center justify-center flex-col border border-solid"
+          v-for="(item, index) in list"
+          :key="index"
+        >
+          <view class="text-26rpx">{{ item.name }}</view>
+          <view class="price-text text-34rpx font-medium mt-15rpx">{{ item.price }}</view>
+          <view :class="Index == index ? 'text-hex-f59e0b' : ''" class="text-26rpx mt-15rpx text-hex-909399">{{ item.times.text }} </view>
         </view>
       </view>
       <!--  -->
       <view class="mt-30rpx text-28rpx">
-       <text class="leading-40rpx">
-          {{chooseVip.description}}
-       </text>
+        <text class="leading-40rpx">
+          {{ chooseVip.description }}
+        </text>
       </view>
       <!--  -->
       <view class="flex items-center mt-20rpx">
         <u-checkbox v-model="checked" shape="circle" active-color="#f59e0b" size="28" icon-size="18"></u-checkbox>
-        <view class="text-22rpx -ml-15rpx mt-8rpx ">
+        <view class="text-22rpx -ml-15rpx mt-8rpx">
           已同意并阅读
           <text class="text-hex-f59e0b">《平台协议》、</text>
           <text class="text-hex-f59e0b">《价格说明》</text>
         </view>
       </view>
       <!--  -->
-      <view
-        class="w-full mt-30rpx h-88rpx bg-hex-404040 rounded-full text-center text-hex-f59e0b leading-88rpx text-32rpx" @click="onSumbit">
-        {{user.is_vip?'续费':'立即开通'}}</view>
+      <view class="w-full mt-30rpx h-88rpx bg-hex-404040 rounded-full text-center text-hex-f59e0b leading-88rpx text-32rpx" @click="onSumbit">
+        {{ user.is_vip ? '续费' : '立即开通' }}</view
+      >
     </view>
   </view>
 </template>
 
 <script>
-  import { wxpay, alipay } from '@/utils/pay.js';
-  export default {
-    data() {
-      return {
-        isFirstLoading:true,
-        list: [],
-        Index: 0,
-        checked: true
-      };
+import { wxpay, alipay } from '@/utils/pay.js';
+export default {
+  data() {
+    return {
+      isFirstLoading: true,
+      list: [],
+      Index: 0,
+      checked: true,
+    };
+  },
+  computed: {
+    user() {
+      return this.$store.getters.user ?? {};
     },
-    computed:{
-      user() {
-        return this.$store.getters.user ?? {};
-      },
-      chooseVip(){
-        return this.list[this.Index]
-      },
-      time(){
-        return this.$u.timeFormat(this.user.vip_expired, 'yyyy-mm-dd');
+    chooseVip() {
+      return this.list[this.Index] ?? {};
+    },
+    time() {
+      return this.$u.timeFormat(this.user.vip_expired, 'yyyy-mm-dd');
+    },
+  },
+  onLoad() {
+    this.getDate();
+  },
+  methods: {
+    async getDate() {
+      try {
+        const resData = await this.$api.get('/v1/vip');
+        this.list = resData;
+      } catch (err) {
+      } finally {
+        this.isFirstLoading = false;
       }
     },
-    onLoad() {
-      this.getDate()
-    },
-    methods: {
-      async getDate(){
-        try{
-          const resData=await this.$api.get('/v1/vip')
-          this.list=resData
-        }catch(err){}finally{
-          this.isFirstLoading=false
+    async onSumbit() {
+      if (!this.checked) return this.$u.toast('请勾选协议');
+      try {
+        const resData = await this.$api.post('/v1/vip/buy', { vip_id: this.chooseVip.id });
+        if (resData.status == 1) {
+          return this.success();
         }
-      },
-     async onSumbit(){
-       if(!this.checked) return this.$u.toast('请勾选协议')
-       try{
-         const resData=await this.$api.post('/v1/vip/buy',{vip_id:this.chooseVip.id})
-         const res=await wxpay(resData.data)
-         if(res=='success'){
-           this.$u.toast('充值成功');
-           this.$store.dispatch('user/getUserInfo');
-           setTimeout(()=>{
-             uni.navigateBack({})
-           },300)
-         }else{
-           this.$u.toast('支付失败');
-         }
-       }catch(err){
-       }
-      }
+        const res = await wxpay(resData.data);
+        if (res == 'success') {
+          this.success();
+        } else {
+          this.$u.toast('支付失败');
+        }
+      } catch (err) {}
+    },
+    success() {
+      this.$u.toast('充值成功');
+      this.$store.dispatch('user/getUserInfo');
+      setTimeout(() => {
+        uni.navigateBack({});
+      }, 300);
     }
-  }
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .item {
-    background-image: linear-gradient(-90deg,
-        #e3a96d 0%,
-        #f8cfb4 100%), linear-gradient(#c59f6d,
-        #c59f6d);
-        border-radius: 50%;
-        width: 64rpx;
-        height: 64rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-  }
+.item {
+  background-image: linear-gradient(-90deg, #e3a96d 0%, #f8cfb4 100%), linear-gradient(#c59f6d, #c59f6d);
+  border-radius: 50%;
+  width: 64rpx;
+  height: 64rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
diff --git a/src/pages/confirm_order/confirm_order.vue b/src/pages/confirm_order/confirm_order.vue
index 0787777..ac6587b 100644
--- a/src/pages/confirm_order/confirm_order.vue
+++ b/src/pages/confirm_order/confirm_order.vue
@@ -162,7 +162,7 @@
         合计: <text class="text-xl" v-if="orderInfo.total_points >0"> {{orderInfo.total_points}}积分+</text> <text class="text-xl text-txSvip">￥{{ orderInfo.total_amount }}</text>
       </view>
       <view @tap="createOrder" class="w-180rpx h-66rpx leading-66rpx text-center text-lg ml-40rpx text-white bg-primary rounded-lg mr-base">提交订单</view>
-      <view v-if="is_company" @tap="createPreOrder" class="w-180rpx h-66rpx leading-66rpx text-center text-lg ml-20rpx text-white bg-hex-D43030 rounded-lg mr-base">生成订单</view>
+      <view v-if="is_company && type != 'desk'" @tap="createPreOrder" class="w-180rpx h-66rpx leading-66rpx text-center text-lg ml-20rpx text-white bg-hex-D43030 rounded-lg mr-base">生成订单</view>
     </view>
   </view>
 </template>
@@ -209,6 +209,7 @@
         this.$api.get(`/v1/store/desk/${desk}`).then(res => {
           this.desk = res
           this.type = 'desk'
+          this.remarks = '桌号:' + this.desk.name
           // 商户 id
           this.mid = options.mid
           // 购物车商品 id
diff --git a/src/pages/order_details/index.vue b/src/pages/order_details/index.vue
index cd254bc..12ef15a 100644
--- a/src/pages/order_details/index.vue
+++ b/src/pages/order_details/index.vue
@@ -55,7 +55,7 @@
     <view class="bg-white rounded-xs mt-24rpx py-base px-40rpx">
       <!-- <view class="text-xl">商家名称</view> -->
       <block v-for="(item, index) in products" :key="item.id">
-        <view @tap="$u.routeAuth('/pages/product_details/index', { skuId: item.sku_id })" class="mb-base">
+        <view @tap="$u.routeAuth('/pages/product_details/index', { skuId: item.spu_id })" class="mb-base">
           <view class="flex">
             <u-image border-radius="10" width="190rpx" height="190rpx" :src="item.cover" :lazy-load="true"></u-image>
             <view class="flex-1 ml-16rpx w-0 flex justify-between flex-col">
diff --git a/src/pages/welcome/index.vue b/src/pages/welcome/index.vue
index e807d2b..d3b5d0e 100644
--- a/src/pages/welcome/index.vue
+++ b/src/pages/welcome/index.vue
@@ -28,13 +28,13 @@
       }
       // 产品详细页
       if (scene.p) {
-        uni.redirectTo({
+        uni.reLaunch({
           url: '/pages/product_details/index?skuId=' + scene.product
         })
       }
       // 扫码下单
       else if (scene.o) {
-        uni.redirectTo({
+        uni.reLaunch({
           url: '/pageB/select_product/com_order?id=' + scene.o
         })
       }
@@ -46,7 +46,7 @@
         const id = scene.c
         // 店铺 id
         const mid = scene.s
-        uni.redirectTo({
+        uni.reLaunch({
           url: `/pageB/select_product/search?mid=${mid}&cid=${id}`
         });
       }