fix:xinz

commit/product.js

@@ -70,6 +70,9 @@ export function editSupplyChainPrice(id,data) {
      })
 }
 /**
+ * @description 供应链商品 -- 修改销售价
+ */
+/**
  * @description 供应链商品 -- 上下架
  */
 export function postchangeshow(data) {

commit/requestPhp.js

@@ -13,7 +13,7 @@ export function myRequestPhp(options) {
 	let header = {
 		'Content-Type': 'application/json;charset=UTF-8',
 		// 'X-Token': 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuaHh4ZmIuY29tIiwiYXVkIjoiYXBpLmh4eGZiLmNvbSIsImlhdCI6MTc0MDM3MTM1NSwibmJmIjoxNzQwMzcxMzU1LCJleHAiOjE3NTExNzEzNTUsImp0aSI6WzI5OCwibWVyIl19.j2f8VwdwWY4zBpcijHntzUZ9YUms2SxChaVsYf7KnPs',
-		"x-Token": uni.getStorageSync('phpToken'), //token
+		"X-Token": uni.getStorageSync('phpToken'), //token
 		// "X-Token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuaHh4ZmIuY29tIiwiYXVkIjoiYXBpLmh4eGZiLmNvbSIsImlhdCI6MTc0MDU3MTQ0OCwibmJmIjoxNzQwNTcxNDQ4LCJleHAiOjE3NTEzNzE0NDgsImp0aSI6WzM1NCwibWVyIl19.PVwYv71Gq9RxTxQclUoFMgc8cZt0ju3zQkxk6SGCQJw",
 		...options.header
 	}

commit/user.js

@@ -15,7 +15,7 @@ const apiType = "php"
  * 
  * @returns 获取用户信息
  */
-export function getBaseInfo() {
+export function getBaseInfo(data) {
   return myRequestPhp({
          url: `${pre}mer/info`,
           method: 'GET',

main.js

@@ -5,9 +5,9 @@ import Vue from 'vue'
 import time from '@/commit/item.js';
 import store from '@/store/index.js'
 import uView from '@/uni_modules/uview-ui';
-
+import Vconsole from "vconsole"
 // import VConsole from 'vconsole'
-// const vConsole = new VConsole();
+const vConsole = new Vconsole();
 // console.log('vConsole is running!');
 
 Vue.config.productionTip = false
@@ -15,6 +15,7 @@ Vue.prototype.$time = time
 Vue.prototype.$store = store 
 App.mpType = 'app'
 Vue.use(uView);
+
 const app = new Vue({
     ...App,
 	   store

pages.json

@@ -60,6 +60,14 @@
 		  "enablePullDownRefresh": true
 	    }
 	  },
+        {
+	    "path": "pages/onlineproductselection/onlineDetail",
+	    "style": {
+	      // "navigationBarTitleText": "在线选品"
+	      "navigationStyle": "custom"//详情
+	    }
+	  },
+      
 	  {
 	    "path": "pages/supplychainon/supplychainon",
 	    "style": {

pages/onlineproductselection/components/detail/DeliveryInfo.vue

@@ -0,0 +1,49 @@
+<template>
+  <view class="delivery-info">
+    <view class="delivery-item">
+      <view class="label">配送至</view>
+      <view class="value">{{ delivery.to }}</view>
+    </view>
+    <view class="delivery-item">
+      <view class="label">包邮</view>
+      <view class="value">{{ delivery.freeShipping }}</view>
+    </view>
+    <view class="delivery-item">
+      <view class="label">起购</view>
+      <view class="value">{{ delivery.minPurchase }}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    delivery: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.delivery-info {
+  background-color: #ffffff;
+  border-radius: 10rpx;
+  box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+  padding: 30rpx;
+  margin-bottom: 30rpx;
+}
+.delivery-item {
+  margin-bottom: 15rpx;
+}
+.label {
+  font-size: 28rpx;
+  color: #666666;
+  margin-bottom: 8rpx;
+}
+.value {
+  font-size: 26rpx;
+  color: #333333;
+}
+</style>

pages/onlineproductselection/components/detail/ProductInfo.vue

@@ -0,0 +1,65 @@
+<template>
+  <view class="product-info">
+    <view class="price-section">
+      <view class="price-item">
+        <view class="label">销售价</view>
+        <view class="value">￥{{ product.salePrice }}</view>
+      </view>
+      <view class="price-item">
+        <view class="label">创客利润</view>
+        <view class="value">￥{{ product.creatorProfit }}</view>
+      </view>
+      <view class="price-item">
+        <view class="label">养老金</view>
+        <view class="value">￥{{ product.pension }}</view>
+      </view>
+    </view>
+    <view class="brand-info">
+      <view class="label">品牌商</view>
+      <view class="value">{{ product.brand }}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    product: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.product-info {
+  background-color: #ffffff;
+  border-radius: 10rpx;
+  box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+  padding: 30rpx;
+  margin-bottom: 30rpx;
+}
+.price-section {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.price-item {
+  width: 33%;
+  margin-bottom: 20rpx;
+}
+.label {
+  font-size: 24rpx;
+  color: #666666;
+  margin-bottom: 8rpx;
+}
+.value {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+.brand-info {
+  margin-top: 20rpx;
+}
+</style>

pages/onlineproductselection/components/detail/ProductSpec.vue

@@ -0,0 +1,40 @@
+<template>
+  <view class="product-spec">
+    <view class="spec-header">
+      <view class="label">规格</view>
+    </view>
+    <view class="spec-value">{{ product.spec }}</view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    product: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.product-spec {
+  background-color: #ffffff;
+  border-radius: 10rpx;
+  box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+  padding: 30rpx;
+  margin-bottom: 30rpx;
+}
+.spec-header {
+  margin-bottom: 15rpx;
+}
+.label {
+  font-size: 28rpx;
+  color: #666666;
+}
+.spec-value {
+  font-size: 30rpx;
+  color: #333333;
+}
+</style>

pages/onlineproductselection/components/listCard/product-item.vue

@@ -0,0 +1,124 @@
+<!-- components/product-item.vue -->
+<template>
+  <view class="product-card">
+    <view class="product-header">
+      <text class="product-name">{{ product.name }}</text>
+      <text class="product-status" :class="statusClass">{{ product.status }}</text>
+    </view>
+
+    <view class="price-info">
+      <text class="price-label">销售价：</text>
+      <text class="price-value">¥{{ product.price.toFixed(2) }}</text>
+    </view>
+
+    <view class="profit-info">
+      <text class="profit-label">创客利润：</text>
+      <text class="profit-value">¥{{ product.profit.toFixed(2) }}</text>
+    </view>
+
+    <view class="action-buttons">
+      <button class="btn detail" @click="$emit('detail')">商品详情</button>
+      <button 
+        class="btn add" 
+        :class="{ added: product.inLibrary }"
+        @tap="$emit('add-to-library', product)"
+      >
+        {{ product.inLibrary ? '已加入' : '加入商品库' }}
+      </button>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+    props: {
+        product: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+    data(){
+        return {
+
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.product-card {
+  background: #fff;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.08);
+
+  .product-header {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20rpx;
+  }
+
+  .product-name {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 500;
+  }
+
+  .product-status {
+    font-size: 24rpx;
+    &.normal {
+      color: #67C23A;
+    }
+  }
+
+  .price-info, .profit-info {
+    margin-bottom: 12rpx;
+    display: flex;
+    align-items: center;
+  }
+
+  .price-label, .profit-label {
+    font-size: 26rpx;
+    color: #666;
+  }
+
+  .price-value {
+    color: #F56C6C;
+    font-weight: bold;
+  }
+
+  .profit-value {
+    color: #E6A23C;
+    font-weight: bold;
+  }
+
+  .action-buttons {
+    display: flex;
+    gap: 20rpx;
+    margin-top: 24rpx;
+
+    .btn {
+      flex: 1;
+      height: 64rpx;
+      line-height: 64rpx;
+      border-radius: 32rpx;
+      font-size: 26rpx;
+      transition: all 0.3s;
+
+      &.detail {
+        background: #f8f8f8;
+        color: #666;
+      }
+
+      &.add {
+        background: linear-gradient(90deg, #409EFF, #79BBFF);
+        color: #fff;
+
+        &.added {
+          background: #e0e0e0;
+          color: #999;
+        }
+      }
+    }
+  }
+}
+</style>

pages/onlineproductselection/onlineproductselection.vue

@@ -1,19 +1,78 @@
 <template>
-	<view>
-		在线选品模块
+  <view class="online-class-wrapper">
+    <view class="headers">
+      <headersVue
+        headerTitle="在线选品列表"
+        @headerJump="headerJump"
+      ></headersVue>
+	      <view class="headers-box">
+      <searchVue
+        placeholder="请输入商品名称"
+        @search="onHandleSearch"
+      ></searchVue>
+      <tablist
+        class="mt"
+        :category="category"
+        :curruntActive="curruntActive"
+        @tabs="tabsHandleClick"
+      ></tablist>
+    </view>
+    </view>
+	<view class="online-content">
+		<button @click="goJump">详情</button>
 	</view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
+import headersVue from "../../shop/components/headers/headers.vue";
+import searchVue from "../../shop/commodity/components/search/search.vue";
+export default {
+  components: {
+    headersVue,
+	searchVue
+  },
+  data() {
+    return {
+		   curruntActive: 0,
+      category: [],
+	};
+  },
+  methods:{
+	headerJump(){
+		uni.switchTab({ url: '/shop/productManagementModule/productManagement' })
+	},
+	goJump(){
+		console.log("fff")
+		uni.redirectTo({ url: './onlineDetail' })
+	},
+	onHandleSearch(val){
+
+	},
+	tabsHandleClick(){
+
 	}
+  }
+};
 </script>
+<style>
+page {
+  background-color: #f7f8fc;
+  height: 100%;
+}
+</style>
+<style lang="scss" scoped>
+.online-class-wrapper{
+	height: 100%;
+	.headers{
+		border: 2rpx solid red;
+		width: 100%;
+		height: 100rpx;
+		box-sizing: border-box;
 
-<style lang="scss">
+	}
+	.online-content{
 
+	}
+}
 </style>

pages/supplychainon/ProductCard.vue

@@ -61,13 +61,18 @@
           >
         </view>
       </view>
-
+     <view class="meta-info">
+        <view class="meta-item">
+          <view  style="padding-right:10rpx;font-size:26rpx">活动：</view>
+          <text  :style="{color:data.seckill == 1?'#FF3C29':'#666666','font-size':'26rpx'}">{{data.seckill == 1?'秒杀':'无'}}</text>
+        </view>
+      </view>
       <!-- 操作按钮 -->
       <view class="action-bar">
         <button class="action-btn edit-price" @click="$emit('edit-price',data)">
           改价
         </button>
-        <button class="action-btn set-activity" @click="$emit('edit-activity',data)">
+        <button class="action-btn set-activity" @click="$emit('edit-activity',data)" v-if="!data.spec_type">
           活动
         </button>
       </view>

pages/supplychainon/price-edit-modal.vue

@@ -2,99 +2,190 @@
   <view class="price-edit-modal">
     <!-- 遮罩层 -->
     <view class="mask" @tap="close"></view>
-    
+
     <!-- 弹窗内容 -->
     <view class="modal-content">
       <view class="modal-header">修改销售价</view>
-      
-      <!-- 商品类型选择 -->
-      <view class="goods-type">
-        <text class="label">商品类型：</text>
-        <radio-group @change="handleTypeChange">
-          <view v-for="item in goodsTypes" :key="item.value" class="radio-item">
-            <label>
-              <radio :value="item.value" :checked="currentType === item.value" color="#007AFF"/>
-              {{ item.label }}
-            </label>
+      <template v-for="(listItem, isd) in upList">
+       <view class="wparnkd-centent" :key="'sdfgdxf' + isd">
+         <!-- 商品类型选择 -->
+        <view class="goods-type" :key="'sdfgdf' + isd">
+          <text class="label">商品类型：</text>
+          <radio-group @change="handleTypeChange">
+            <view
+              v-for="(item, index) in goodsTypesData"
+              :key="item.value + '_index' + index"
+              class="radio-item"
+            >
+              <label>
+                <radio
+                  :value="String(item.value)"
+                  :checked="currentType === item.value"
+                  color="#007AFF"
+                />
+                {{ item.label }}
+              </label>
+            </view>
+          </radio-group>
+        </view>
+        <view v-if="uplength != 1 && uplength != 0" :key="'sdfgdttf' + isd">
+          <view style="padding-bottom: 10rpx">规格:</view>
+          <view style="color: #007aff">{{ listItem.detail.规格 }}</view>
+        </view>
+        <!-- 价格输入区域 -->
+        <view class="price-input" :key="'sdfotktmgdf' + isd">
+          <text class="tip"
+            >最低销售价格不能小于：{{ listItem.min_market_price }}</text
+          >
+          <view class="input-row">
+            <text>销售价：</text>
+            <input
+              type="number"
+              v-model="fuzupList[isd].price"
+              placeholder="请输入销售价"
+              @input="calculateProfit"
+            />
           </view>
-        </radio-group>
-      </view>
-
-      <!-- 价格输入区域 -->
-      <view class="price-input">
-        <text class="tip">最低销售价格不能小于：{{ minPrice }}</text>
-        <view class="input-row">
-          <text>销售价：</text>
-          <input 
-            type="number" 
-            v-model="currentPrice" 
-            placeholder="请输入销售价"
-            :min="minPrice"
-            @input="calculateProfit"
-          />
         </view>
-      </view>
-
-      <!-- 计算结果显示 -->
-      <view class="profit-display">
-        <view>养老金：{{ pensionFund.toFixed(2) }}</view>
-        <view>创客利润：{{ makerProfit.toFixed(2) }}</view>
-      </view>
 
+        <!-- 计算结果显示 -->
+        <view class="profit-display" :key="'sdkkf' + isd">
+          <view>销售价：{{ listItem.price || "0.00" }}</view>
+          <view>养老金：{{ listItem.gong_pension || "0.00" }}</view>
+          <view>创客利润：{{ listItem.plate_mer_profit || "0.00" }}</view>
+        </view>
+       </view>
+      </template>
       <button class="confirm-btn" @tap="handleConfirm">确定</button>
     </view>
   </view>
 </template>
 
 <script>
-import {getBaseInfo} from "@/commit/user.js"
+import { editSupplyChainPrice } from "@/commit/product.js";
 export default {
   props: {
-    minPrice: { type: Number, default: 8.75 },
-    originalPrice: { type: Number, required: true },
-    goodsType: { type: String, default: 1 }
+    productData: {
+      type: Object,
+      default: () => {},
+    },
+    merInfo: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
-      currentPrice: this.originalPrice,
-      currentType: this.goodsType,
-      pensionFund: 0,
-      makerProfit: 1.75,
-      goodsTypes: [
-        { label: '普通商品', value: 1 },
-        { label: '会员商品', value: 8 },
-        { label: '高级会员商品', value: 10 },
-        { label: '合伙人商品', value: 14 },
-        { label: '股权商品', value: 15 },
-        { label: '合伙人+股权商品', value: 16 }
-      ]
-    }
+      currentPrice: "",
+      currentType: "",
+      goodsTypes: "", // 商品类型
+      productStyles: [
+        { value: "", label: "全部" },
+        { value: "0", label: "单规格" },
+        { value: "1", label: "多规格" },
+      ],
+      upList: [], //attrValue
+      uplength: 0, //attrValue.length
+      pnjen: "", //product_id
+      fuzupList: [], //attrValue
+    };
+  },
+  watch: {
+    productData: {
+      handler(val) {
+        this.getProductData(val);
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.getProductData(this.productData);
   },
   methods: {
     handleTypeChange(e) {
-      this.currentType = e.detail.value
+      this.currentType = e.detail.value;
       // 这里可以添加不同类型的价格计算逻辑
     },
     calculateProfit() {
       // 示例计算逻辑，实际根据业务需求修改
-      this.pensionFund = this.currentPrice * 0.05
-      this.makerProfit = this.currentPrice * 0.15
+      this.pensionFund = this.currentPrice * 0.05;
+      this.makerProfit = this.currentPrice * 0.15;
+    },
+    getProductData(val) {
+      const _this = this;
+      const ev = (val && val.attrValue) || [];
+      const en = val && val.product_id;
+      const etype = val && val.type;
+      _this.goodsTypes = etype;
+      _this.upList = JSON.parse(JSON.stringify([...ev]));
+      _this.fuzupList = JSON.parse(JSON.stringify([...ev]));
+      _this.pnjen = en;
+      _this.uplength = ev.length;
     },
     handleConfirm() {
-      if (this.currentPrice < this.minPrice) {
-        uni.showToast({ title: '价格不能低于最低价', icon: 'none' })
-        return
+      var reg =
+        /(^[1-9]([0-9]+)?(.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9].[0-9]([0-9])?$)/;
+      //单拿数据 组成新的数组
+      const skuArr = this.fuzupList.map((project) => ({
+        sku_id: project.gong_sku_id,
+        edit_price: project.price,
+      }));
+      let _this = this;
+      const isEmtyPrice = skuArr.some(
+        (item) =>
+          item.edit_price == "" ||
+          item.edit_price == null ||
+          item.edit_price == undefined
+      );
+      const isZQPrice = skuArr.some(
+        (item) => !reg.test(item.edit_price) || item.edit_price == 0
+      );
+      if (isEmtyPrice) {
+        uni.showToast({ title: "请输入金额", icon: "none" });
+        return;
+      }
+      if (isZQPrice) {
+        uni.showToast({ title: "请输入正确金额", icon: "none" });
+        return;
       }
-      this.$emit('confirm', {
-        price: Number(this.currentPrice),
-        type: this.currentType
-      })
+      editSupplyChainPrice(this.pnjen, {
+        skuArr: skuArr,
+        type: this.goodsTypes,
+      }).then(
+        (res) => {
+          if (res.data.status == 200) {
+            uni.showToast({ title: res.data.message, icon: "none" });
+            _this.$emit("confirm");
+          } else {
+            uni.showToast({ title: res.data.message, icon: "none" });
+          }
+        },
+        (fail) => {
+          uni.showToast({ title: res.data.message, icon: "none" });
+        }
+      );
     },
     close() {
-      this.$emit('close')
-    }
-  }
-}
+      this.$emit("close");
+    },
+  },
+  computed: {
+    goodsTypesData() {
+      if (this.merInfo && this.merInfo.mer_id == 324) {
+        return [
+          { label: "普通商品", value: 1 },
+          { label: "会员商品", value: 8 },
+          { label: "高级会员商品", value: 10 },
+          { label: "合伙人商品", value: 14 },
+          { label: "股权商品", value: 15 },
+          { label: "合伙人+股权商品", value: 16 },
+        ];
+      } else {
+        return [{ label: "普通商品", value: 1 }];
+      }
+    },
+  },
+};
 </script>
 
 <style scoped>
@@ -105,7 +196,7 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
-  background: rgba(0,0,0,0.5);
+  background: rgba(0, 0, 0, 0.5);
   z-index: 999;
 }
 
@@ -122,6 +213,11 @@ export default {
   z-index: 1000;
 }
 
+.wparnkd-centent{
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
 .modal-header {
   font-size: 18px;
   font-weight: bold;
@@ -158,7 +254,7 @@ input {
 
 /* 按钮样式 */
 .confirm-btn {
-  background: #007AFF;
+  background: #007aff;
   color: white;
   margin-top: 30rpx;
   border-radius: 8rpx;

pages/supplychainon/supplychainon.vue

@@ -22,6 +22,7 @@
           :data="item"
           @status-change="handleStatusChange"
           @edit-price="handleEditPrice"
+          @edit-activity="handleEditActivity"
         />
       </template>
       <template v-else>
@@ -35,7 +36,77 @@
         —— 已经到最底部了哦 ——
       </view>
     </view>
-    <priceEditModal v-if="isshow" @close="isshow=false"/>
+    <priceEditModal
+      v-if="isshow"
+      :product-data="productObjData"
+      :merInfo="merInfo"
+      @close="priceEditModalClose"
+      @confirm="confirm"
+    />
+    <!-- 弹窗主体 -->
+    <uni-popup
+      ref="popup"
+      type="center"
+      :is-mask-click="false"
+      background-color="#rgba(0,0,0,0.5)"
+    >
+      <view class="popup-container" :class="[isOpen ? 'popup-show' : '']">
+        <!-- 标题区 -->
+        <view class="popup-header">
+          <text class="title">活动设置</text>
+        </view>
+        <!-- 内容区 -->
+        <view class="content-wrapper-popup">
+          <view class="form-item">
+            <uni-data-checkbox
+              mode="button"
+              icon="left"
+              v-model="formData.radio"
+              :localdata="rangeData"
+            ></uni-data-checkbox>
+          </view>
+          <!-- 秒杀区块 -->
+          <view class="form-item">
+            <uni-data-checkbox
+              mode="button"
+              icon="left"
+              v-model="formData.radios"
+              :localdata="rangeData1"
+              @change="onSwitchChange"
+            ></uni-data-checkbox>
+          </view>
+
+          <!-- 价格输入 -->
+          <view class="form-item">
+            <view class="item-label">秒杀价格</view>
+            <uni-easyinput
+              v-model="formData.seckill_price"
+              :errorMessage="isEmpty"
+              focus
+              placeholder="输入价格"
+              :adjust-position="false"
+              @change="changeInput"
+              type="digit"
+            ></uni-easyinput>
+          </view>
+          <!-- 时间选择 -->
+          <view class="form-item">
+            <view class="item-label">时间设置</view>
+            <uni-datetime-picker
+              type="datetime"
+              v-model="formData.seckill_date"
+              @change="onDateChange"
+            />
+          </view>
+        </view>
+
+        <!-- 操作按钮 -->
+        <view class="action-btns">
+          <button class="btn prev-step" @click="closePopup">取消</button>
+          <button class="btn submit-btn" @click="handleSubmit">提交</button>
+        </view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
@@ -45,12 +116,14 @@ import searchVue from "./search/search.vue";
 import tablist from "./tablist.vue";
 import ProductCard from "./ProductCard.vue";
 import emptyDataVue from "../../shop/components/emptyData/emptyData.vue";
-import priceEditModal from './price-edit-modal.vue'
+import priceEditModal from "./price-edit-modal.vue";
 import {
   getSupplyChainList,
   getSupplyChainTab,
   postchangeshow,
+  Addseckill, //活动
 } from "@/commit/product.js";
+import { getBaseInfo } from "@/commit/user.js";
 export default {
   components: {
     headerCom,
@@ -58,7 +131,7 @@ export default {
     tablist,
     ProductCard,
     emptyDataVue,
-    priceEditModal
+    priceEditModal,
   },
   data() {
     return {
@@ -72,7 +145,24 @@ export default {
       curruntActive: 0,
       category: [],
       type: 1,
-      isshow:false
+      isshow: false,
+      formData: {
+        radio: "1",
+        radios: "1",
+        seckill_price: "",
+        seckill_date: "",
+        product_id: "",
+      },
+      isOpen: false,
+      rangeData: [
+        { value: "1", text: "大仓活动" },
+        { value: "2", text: "平台活动" },
+      ],
+      rangeData1: [{ value: "1", text: "秒杀" }],
+      isEmpty: false,
+      dataObj: {},
+      productObjData: {},
+      merInfo: {},
     };
   },
   async onLoad(options) {
@@ -99,6 +189,27 @@ export default {
     }
   },
   methods: {
+    getBaseInfoData() {
+      getBaseInfo()
+        .then((res) => {
+          if (res.data.status === 200) {
+            // console.log(res.data.data)
+            this.merInfo = res.data.data || {};
+          } else {
+            this.merInfo = {};
+          }
+        })
+        .catch((err) => {
+          uni.showToast({
+            title: res.data.message || "获取失败",
+            mask: true,
+          });
+        });
+    },
+    async initData() {
+      await this.getSupplyChainTabData();
+      await this.getSupplyChainListData();
+    },
     async tabsHandleClick({ index, item }) {
       this.indexs = index;
       this.curruntActive = index;
@@ -106,7 +217,7 @@ export default {
       this.type = item.type || 1;
       this.page = 1;
       this.is_panudn = true;
-       uni.pageScrollTo({ scrollTop: 0, duration: 0 });
+      uni.pageScrollTo({ scrollTop: 0, duration: 0 });
       await this.getSupplyChainListData();
     },
     async getSupplyChainTabData() {
@@ -178,10 +289,104 @@ export default {
           uni.hideToast();
         });
     },
-   handleEditPrice(data){
-    //  this.productData = data;
-     this.isshow = true;
-   }
+    handleEditPrice(data) {
+      this.productObjData = data;
+      this.isshow = true;
+      document.body.style.overflow = "hidden";
+      this.getBaseInfoData();
+    },
+    priceEditModalClose() {
+      this.isshow = false;
+       document.body.style.overflow = "visible";
+    },
+    confirm() {
+      this.isshow = false;
+      this.initData();
+    },
+    handleEditActivity(data) {
+      this.dataObj = data;
+      this.isEmpty = false;
+      this.showPopup();
+    },
+    showPopup() {
+      this.isOpen = true;
+      this.$refs.popup.open();
+    },
+    closePopup() {
+      this.isOpen = false;
+      this.formData.radio = "1";
+      this.formData.radios = "1";
+      this.formData.seckill_price = "";
+      this.formData.seckill_date = "";
+      this.$refs.popup.close();
+    },
+    onDateChange(data) {
+      this.formData.seckill_date = data;
+    },
+    convertToISOString(dateStr) {
+      // 将输入的日期时间字符串中的空格替换为 'T'，以符合 ISO 8601 格式
+      const isoFormatStr = dateStr.replace(" ", "T");
+      // 创建 Date 对象
+      const date = new Date(isoFormatStr);
+      // 将 Date 对象转换为 ISO 8601 格式的字符串
+      return date.toISOString();
+    },
+    async handleSubmit() {
+      // 提交逻辑
+      this.formData.product_id = this.dataObj.product_id;
+      let params = JSON.parse(JSON.stringify(this.formData));
+
+      if (
+        params.seckill_price == "" ||
+        params.seckill_price == null ||
+        params.seckill_price == undefined
+      ) {
+        uni.showToast({
+          title: "请输入秒杀价格",
+          icon: "none",
+        });
+        this.isEmpty = true;
+        return;
+      }
+      if (
+        params.seckill_date == "" ||
+        params.seckill_date == null ||
+        params.seckill_date == undefined
+      ) {
+        uni.showToast({
+          title: "请选择秒杀时间",
+          icon: "none",
+        });
+        return;
+      }
+      params.seckill_date = this.convertToISOString(params.seckill_date);
+
+      this.isEmpty = false;
+      uni.showLoading({
+        title: "秒杀活动添加中",
+      });
+      console.log(params);
+      try {
+        const res = await Addseckill(params);
+        if (res.data.status == 200) {
+          uni.showToast({
+            title: "秒杀活动添加成功",
+            icon: "none",
+          });
+          this.closePopup();
+          this.initData();
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+        uni.hideToast();
+      }
+    },
+    changeInput(val) {
+      if (val) {
+        this.isEmpty = false;
+      }
+    },
   },
 };
 </script>
@@ -216,4 +421,67 @@ page {
 .mrb {
   margin-bottom: 26rpx;
 }
+.popup-container {
+  width: 80vw;
+  background: #ffffff;
+  border-radius: 16rpx;
+  transition: all 0.3s ease;
+  transform: scale(0.8);
+  opacity: 0;
+  padding: 20rpx;
+  .popup-header {
+    padding: 0rpx 15rpx 15rpx;
+    border-bottom: 1px solid #eee;
+    .title {
+      font-size: 36rpx;
+      font-weight: 600;
+      color: #333;
+      text-align: center;
+    }
+  }
+}
+.content-wrapper-popup {
+  overflow: auto;
+  .form-item {
+    padding: 15rpx 0;
+    .item-label {
+      font-size: 28rpx;
+      font-weight: 600;
+      color: #333;
+      margin-bottom: 12rpx;
+    }
+  }
+}
+.popup-show {
+  transform: scale(1);
+  opacity: 1;
+}
+.action-btns {
+  display: flex;
+  padding: 24rpx;
+  gap: 20rpx;
+  border-top: 1px solid #eee;
+
+  .btn {
+    flex: 1;
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+
+    &.prev-step {
+      background: #f8f8f8;
+      color: #666;
+    }
+
+    &.submit-btn {
+      background: #007aff;
+      color: white;
+    }
+  }
+}
+
+/deep/.uni-popup {
+  z-index: 667;
+}
 </style>

shop/productManagementModule/components/productEvaluation/ReplyModal.vue

@@ -18,7 +18,7 @@
       </view>
       <view class="reply-modal">
         <textarea
-          adjust-position="false"
+          :adjust-position="false"
           v-model="replyContent"
           placeholder="输入回复内容"
           :maxlength="-1"

shop/productManagementModule/index.vue

@@ -16,7 +16,6 @@
         :cardData="onlineData"
         @custom-handle-click="onGongyingliang"
       ></listCardInfo>
-      <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
       <!-- <listCardInfo headerTitle="商品分类" class="mb-t1" :fullSreen="true" fullSreenTitle="商品分类列表" ></listCardInfo> -->
       <!-- <listCardInfo headerTitle="商品规格" class="mb-t1" :fullSreen="true" fullSreenTitle="商品规格列表"></listCardInfo> -->
       <listCardInfo
@@ -26,9 +25,11 @@
         fullSreenTitle="商品评价列表"
         @custom-handle-click="onHandlePingJia"
       ></listCardInfo>
-      <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
-      <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
-      <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
+      <listCardInfo
+       headerTitle="在线选品"
+       class="mb-t1" 
+      :fullSreen="true"
+        fullSreenTitle="在线选品列表"  @custom-handle-click="onHandleXuanPin"></listCardInfo>
     </view>
   </view>
 </template>
@@ -299,6 +300,11 @@ export default {
           return;
         }
     },
+    onHandleXuanPin(){
+      uni.redirectTo({
+        url:"/pages/onlineproductselection/onlineproductselection"
+      })
+    },
     // jinru(n, p) {
     //   let name = p;
     //   let page = n;