Merge branch 'prod' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into test

pages/order/components/order-item.vue

@@ -29,6 +29,7 @@
           <text class="productSkuName" v-if="item.skuName">{{
             item.skuName
           }}</text>
+		  <view class="color-666 u-font-24 u-m-t-4" style="max-width: 328rpx;word-break: break-all;" v-if="item.remark">备注：{{item.remark}}</view>
           <template v-if="showLimitDiscount(item)">
             <text
               class="limitDiscount-time"

pages/order/coupon.vue

@@ -17,10 +17,10 @@
 			</view> -->
 			<view class="status-wrap">
 				<view class="item" :class="{ active: querForm.statusActiveIndex == 0 }" @click="tabChange(0)">
-					<text class="t">商品兑换券 {{ returnSelNumber(0) }}</text>
+					<text class="t">商品兑换券</text>
 				</view>
 				<view class="item" :class="{ active: querForm.statusActiveIndex == 1 }" @click="tabChange(1)">
-					<text class="t">折扣优惠券{{ returnSelNumber(1) }}</text>
+					<text class="t">折扣优惠券</text>
 				</view>
 
 				<view class="icon-wrap" :style="{

pages/product/components/modal.vue

@@ -0,0 +1,97 @@
+<template>
+  <view>
+    <up-popup
+      :show="show"
+      mode="center"
+      :safeAreaInsetBottom="mode === 'bottom' ? true : false"
+    >
+      <view class="popup-content">
+        <view class="top u-flex u-row-between">
+          <text class="font-bold u-font-32 color-333">{{ title }}</text>
+          <up-icon size="18" name="close" @click="show = false"></up-icon>
+        </view>
+        <up-line></up-line>
+        <scroll-view style="max-height: 50vh" :scroll-y="true">
+          <slot></slot>
+        </scroll-view>
+        <template v-if="showBottom">
+          <up-line></up-line>
+
+          <view class="bottom">
+            <view class="btn cancel" @click="close">{{ cancelText }}</view>
+            <view class="btn success" @click="confirm">{{ confirmText }}</view>
+          </view>
+        </template>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+const props = defineProps({
+  mode: {
+    type: String,
+    default: "center",
+  },
+  title: {
+    type: String,
+    default: "标题",
+  },
+  confirmText: {
+    type: String,
+    default: "确认",
+  },
+  cancelText: {
+    type: String,
+    default: "取消",
+  },
+  showBottom: {
+    type: Boolean,
+    default: true,
+  },
+});
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const emits = defineEmits(["close", "confirm"]);
+function close() {
+  show.value = false;
+  emits("close");
+}
+function confirm() {
+  emits("confirm");
+}
+</script>
+<style lang="scss">
+.popup-content {
+  background: #fff;
+  width: 640rpx;
+  border-radius: 18rpx;
+}
+.top {
+  padding: 40rpx 48rpx;
+}
+.bottom {
+  padding: 48rpx 52rpx;
+  display: flex;
+  justify-content: space-between;
+  gap: 50rpx;
+  .btn {
+    flex: 1;
+    text-align: center;
+    padding: 18rpx 60rpx;
+    border-radius: 100rpx;
+    font-size: 32rpx;
+    border: 2rpx solid transparent;
+    &.success {
+      background-color: $my-main-color;
+      color: #fff;
+    }
+    &.cancel {
+      border-color: $my-main-color;
+      color: $my-main-color;
+    }
+  }
+}
+</style>

pages/product/index.vue

@@ -318,7 +318,7 @@
 		<shopindex ref="showShopInfoRef"></shopindex>
 		<!-- 购物车 -->
 		<shoppingCartes :cartLists_count="cartLists_count" :cartList="matchedProducts" :showCart="showCart"
-			:limitDiscount="limitTimeDiscountRes" @customevent="websocketsendMessage" @close="showCart = !showCart"
+			:limitDiscount="limitTimeDiscountRes" @customevent="websocketsendMessage" @close="showCart = !showCart"  
 			:orderinfo="orderinfo" @clickcancelOrder="clickcancelOrder" v-if="cartLists_count > 0"
 			:nextFullAmountActivty="nextFullAmountActivty"></shoppingCartes>
 
@@ -1154,7 +1154,7 @@
 			return;
 		}
 		let res = await shoppingcart();
-
+		
 		if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type ==
 				'sku' && canSubmit.value)) {
 			// 是否是套餐 有就传
@@ -1181,7 +1181,7 @@
 				memberPrice: specifications.item.memberPrice,
 				is_print: 1,
 				product_type: specifications.item.type,
-				is_time_discount: specifications.item.is_time_discount
+				is_time_discount: specifications.item.is_time_discount,
 			});
 			// 清空套餐选中
 			selectedGroupSnap.value = [];
@@ -1201,7 +1201,7 @@
 				memberPrice: specifications.item.memberPrice,
 				is_print: 1,
 				product_type: specifications.item.type,
-				is_time_discount: specifications.item.is_time_discount
+				is_time_discount: specifications.item.is_time_discount,
 			});
 			showShopsku.value = false;