Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

2025-12-18 08:55:52 +08:00 · 2023-01-11 11:29:34 +08:00
parent db33b34f18 94ab061cc8
commit 29cc6002cd
172 changed files with 18183 additions and 235 deletions
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -3,10 +3,10 @@ var BASE = {
   * @description api请求基础路径
   */
  API_DEV: {
-    common: "https://common-api.pickmall.cn",
-    buyer: "https://buyer-api.pickmall.cn",
-    seller: "https://store-api.pickmall.cn",
-    manager: "https://admin-api.pickmall.cn"
+    common: "http://192.168.0.113:8890",
+    buyer: "http://192.168.0.113:8888",
+    seller: "http://192.168.0.113:8889",
+    manager: "http://192.168.0.113:8887"
  },
  API_PROD: {
    common: "https://common-api.pickmall.cn",
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -10,15 +10,15 @@
      <div class="box-left">
        <div class="card shop flex">
          <div>
-            <h4>Hi,<span style="margin-left:5px;">{{userData.nickName}}</span></h4>
+            <h4>Hi,<span style="margin-left:5px;">{{ userData.nickName }}</span></h4>
            <img class="shop-logo" :src="userData.storeLogo || require('@/assets/logo1.png')" alt="">
          </div>
          <div class="shop-box">
            <div class="box-item">
-              <div>店铺名称：{{userData.storeName || '暂无'}}</div>
+              <div>店铺名称：{{ userData.storeName || '暂无' }}</div>
            </div>
            <div class="box-item">
-              <div>店铺状态：{{userData.storeDisable=='OPEN' ? '开启中' : '关闭'}}</div>
+              <div>店铺状态：{{ userData.storeDisable == 'OPEN' ? '开启中' : '关闭' }}</div>
            </div>
            <div class="box-item" @click="im()">
              <Button type="info">点击登录客服</Button>
@@ -27,27 +27,30 @@

          <div class="rate-box">
            <div>
-              <i-circle :size="120" stroke-color="#fecb89" :trail-width="4" :stroke-width="5" :percent="(userData.serviceScore  *  20)" stroke-linecap="square">
+              <i-circle :size="120" stroke-color="#fecb89" :trail-width="4" :stroke-width="5"
+                :percent="(userData.serviceScore * 20)" stroke-linecap="square">
                <div class="demo-Circle-custom">

-                  <p class="bold">{{userData.serviceScore}}分</p>
+                  <p class="bold">{{ userData.serviceScore }}分</p>
                </div>
              </i-circle>
              <h5>服务得分</h5>
            </div>
            <div>
-              <i-circle :size="120" stroke-color="#a7c5eb" :trail-width="4" :stroke-width="5" :percent="(userData.deliveryScore  *  20)" stroke-linecap="square">
+              <i-circle :size="120" stroke-color="#a7c5eb" :trail-width="4" :stroke-width="5"
+                :percent="(userData.deliveryScore * 20)" stroke-linecap="square">
                <div>

-                  <p class="bold">{{userData.deliveryScore}}分</p>
+                  <p class="bold">{{ userData.deliveryScore }}分</p>
                </div>
              </i-circle>
              <h5>交货得分</h5>
            </div>
            <div>
-              <i-circle :size="120" stroke-color="#848ccf" :trail-width="4" :stroke-width="5" :percent="(userData.descriptionScore  *  20)" stroke-linecap="square">
+              <i-circle :size="120" stroke-color="#848ccf" :trail-width="4" :stroke-width="5"
+                :percent="(userData.descriptionScore * 20)" stroke-linecap="square">
                <div>
-                  <p class="bold">{{userData.descriptionScore}}分</p>
+                  <p class="bold">{{ userData.descriptionScore }}分</p>
                </div>
              </i-circle>
              <h5>评价得分</h5>
@@ -60,7 +63,7 @@
          <div class="detail-list">
            <div class="detail-item" @click="navigateTo('orderList')">
              <div>
-                <span>{{homeData.unPaidOrder || 0}}</span>
+                <span>{{ homeData.unPaidOrder || 0 }}</span>
                <div>待付款</div>
              </div>
              <div class="detail-title">
@@ -70,11 +73,11 @@

            <div class="detail-item" @click="navigateTo('orderList')">
              <div>
-                <span>{{homeData.unDeliveredOrder || 0}}</span>
+                <span>{{ homeData.unDeliveredOrder || 0 }}</span>
                <div>待发货</div>
              </div>
              <div>
-                <span>{{homeData.deliveredOrder || 0}}</span>
+                <span>{{ homeData.deliveredOrder || 0 }}</span>
                <div>待收货</div>
              </div>
              <div class="detail-title">
@@ -83,15 +86,15 @@
            </div>
            <div class="detail-item">
              <div @click="navigateTo('returnMoneyOrder')">
-                <span>{{homeData.returnMoney || 0}}</span>
+                <span>{{ homeData.returnMoney || 0 }}</span>
                <div>退款</div>
              </div>
              <div @click="navigateTo('returnGoodsOrder')">
-                <span>{{homeData.returnGoods || 0}}</span>
+                <span>{{ homeData.returnGoods || 0 }}</span>
                <div>退货</div>
              </div>
              <div @click="navigateTo('memberComment')">
-                <span>{{homeData.memberEvaluation || 0}}</span>
+                <span>{{ homeData.memberEvaluation || 0 }}</span>
                <div>待评价</div>
              </div>
              <div class="detail-title">
@@ -100,7 +103,7 @@
            </div>
            <div class="detail-item" @click="navigateTo('orderComplaint')">
              <div>
-                <span>{{homeData.complaint || 0}}</span>
+                <span>{{ homeData.complaint || 0 }}</span>
                <div>待处理</div>
              </div>

@@ -110,11 +113,11 @@
            </div>
            <div class="detail-item" @click="navigateTo('goods')">
              <div>
-                <span>{{homeData.waitUpper || 0}}</span>
+                <span>{{ homeData.waitUpper || 0 }}</span>
                <div>待上架</div>
              </div>
              <div>
-                <span>{{homeData.waitAuth || 0}}</span>
+                <span>{{ homeData.waitAuth || 0 }}</span>
                <div>审核中</div>
              </div>
              <div class="detail-title">
@@ -124,11 +127,11 @@

            <div class="detail-item">
              <div @click="navigateTo('seckill')">
-                <span>{{homeData.seckillNum || 0}}</span>
+                <span>{{ homeData.seckillNum || 0 }}</span>
                <div>秒杀活动</div>
              </div>
              <div @click="navigateTo('accountStatementBill')">
-                <span>{{homeData.waitPayBill || 0}}</span>
+                <span>{{ homeData.waitPayBill || 0 }}</span>
                <div>等待对账</div>
              </div>
              <div class="detail-title">
@@ -143,8 +146,8 @@
      <div class="card box-right">
        <h4>平台公告</h4>
        <div>
-          <div class="notice-title" v-for="(item,index) in notices" :key="index">
-            <a @click="clickLinkNotices(item)">{{item.title}}</a>
+          <div class="notice-title" v-for="(item, index) in notices" :key="index">
+            <a @click="clickLinkNotices(item)">{{ item.title }}</a>
          </div>
        </div>
      </div>
@@ -158,7 +161,7 @@
            <Icon class="icon" size="31" type="md-photos" />
          </div>
          <div>
-            <div class="counts">{{homeData.goodsNum ||0}}</div>
+            <div class="counts">{{ homeData.goodsNum || 0 }}</div>
            <div>商品数量</div>
          </div>

@@ -168,7 +171,7 @@
            <Icon class="icon" size="31" type="ios-card" />
          </div>
          <div>
-            <div class="counts">{{homeData.orderPrice || 0 | unitPrice('￥')}}</div>
+            <div class="counts">{{ homeData.orderPrice || 0 | unitPrice('￥') }}</div>
            <div>订单总额</div>
          </div>

@@ -179,7 +182,7 @@
            <Icon class="icon" size="31" type="md-list" />
          </div>
          <div>
-            <div class="counts">{{homeData.orderNum ||0}}</div>
+            <div class="counts">{{ homeData.orderNum || 0 }}</div>
            <div>订单数量</div>
          </div>

@@ -189,7 +192,7 @@
            <Icon class="icon" size="31" type="md-person" />
          </div>
          <div>
-            <div class="counts">{{homeData.storeUV ||0}}</div>
+            <div class="counts">{{ homeData.storeUV || 0 }}</div>
            <div>访客数量</div>
          </div>

@@ -207,7 +210,7 @@ import Cookies from "js-cookie";

 export default {
  name: "home",
-  data() {
+  data () {
    return {
      noticeFlage: false, // 控制平台公告显隐

@@ -217,18 +220,18 @@ export default {
      noticesDetail: { // 平台公告详情
        title: "",
      },
-      IMLink:"",
+      IMLink: "",
    };
  },
  methods: {
    // 跳转页面
-    navigateTo(name) {
+    navigateTo (name) {
      this.$router.push({
        name,
      });
    },
    // 初始化数据
-    async init() {
+    async init () {
      let userInfo = JSON.parse(Cookies.get("userInfoSeller"));

      this.userData = userInfo;
@@ -239,40 +242,41 @@ export default {
      }
    },
    // 跳转文章页
-    async clickLinkNotices(val) {
+    async clickLinkNotices (val) {
      let res = await seeArticle(val.id);
      if (res.success) {
        this.noticesDetail = res.result;
        this.noticeFlage = true;
      }
    },
-    async im() {
+    async im () {
      // 获取访问Token
      let accessToken = this.getStore("accessToken");
      await this.getIMDetailMethods();
+      let res = await getIMDetail();
      if (!accessToken) {
        this.$Message.error("请登录后再联系客服");
        return;
      }
-      window.open(this.IMLink + "?token=" + accessToken);
+      window.open(`${res.result}?token=` + accessToken);
    },

    // 获取im信息
-    async getIMDetailMethods() {
+    async getIMDetailMethods () {
      let res = await getIMDetail();
      if (res.success) {
        this.IMLink = res.result;
      }
    },
    // 获取首页数据
-    async getHomeData() {
+    async getHomeData () {
      let res = await getSellerHomeData();
      if (res.success) {
        this.homeData = res.result;
      }
    },
  },
-  mounted() {
+  mounted () {
    this.init();
    this.getHomeData();
  },
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -228,6 +228,31 @@
            <span class="label">优惠券金额：</span>
            <span class="txt"> {{ orderInfo.order.priceDetailDTO.couponPrice | unitPrice('￥') }} </span>
          </li>
+          <li v-if="orderInfo.order.priceDetailDTO.discountPriceDetail != undefined && orderInfo.order.priceDetailDTO.discountPriceDetail && orderInfo.order.priceDetailDTO.discountPriceDetail != null && orderInfo.order.priceDetailDTO.discountPriceDetail != ''">      
+            <div class="label">
+              <Poptip trigger="hover" placement="left" width="200">
+                <Icon v-if="typeList.length > 0"  type="ios-alert-outline" size="17" @click="getOrderPrice" color="#cc0000"/>
+              <template #content>
+                <div class="api" style="text-align:left;">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>优惠详情：</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr  v-for="(item,index) in typeList" :key="index">
+                            <td>{{item.promotionName}}：</td>
+                            <td>¥{{ item.discountPrice | unitPrice }}</td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+              </template>
+            </Poptip>
+            <span>优惠详情：</span>
+            </div>
+            </li>
          <li>
            <span class="label">运费：</span>
            <span class="txt">{{
@@ -238,18 +263,31 @@
              <span class="label">修改金额：</span>
              <span class="txt theme_color">¥{{ orderInfo.order.priceDetailDTO.updatePrice | unitPrice }}</span>
            </li>
+            <!-- <li v-if="showPrices"  v-for="(item,index) in typeList" :key="index" > 
+            <hr style="border:1px dashed black;">
+              <span class="label" v-if="index == 1 && typeList.length > 1" style="font-size:10px !important;"><a  @click="gotoHomes" style="display: inline-block;border-bottom: 1px dashed;color:black;width:80px;">{{item.promotionName}}：</a></span>
+              <span class="txt" style="border-bottom: 1px dashed;font-size:10px !important;" v-if="index == 1 &&  typeList.length > 1">¥{{ item.discountPrice | unitPrice }}</span>
+              <span class="label" v-if="index == 0 &&  typeList.length > 1" style="font-size:10px !important;"><a  @click="gotoHomes" style="display: inline-block;border-top: 1px dashed;color:black;width:80px;">{{item.promotionName}}：</a></span>
+              <span class="txt" style="border-top: 1px dashed;font-size:10px !important;" v-if="index == 0 && typeList.length > 1">¥{{ item.discountPrice | unitPrice }}</span>
+              <span class="label" v-if="typeList.length == 1 && index == 0" style="font-size:10px !important;"><a  @click="gotoHomes" style="display: inline-block;border-top: 1px dashed;border-bottom: 1px dashed;color:black;width:80px;">{{item.promotionName}}：</a></span>
+              <span class="txt"  v-if="typeList.length == 1 && index == 0" style="border-top: 1px dashed;border-bottom: 1px dashed;font-size:10px !important;">¥{{ item.discountPrice | unitPrice }}</span>
+            </li> -->
          <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
            <span class="label">使用积分：</span>
            <span class="txt">{{
              orderInfo.order.priceDetailDTO.payPoint
            }}</span>
          </li>
-
          <li>
            <span class="label">应付金额：</span>
            <span class="txt flowPrice"
              >¥{{ orderInfo.order.flowPrice | unitPrice }}</span
            >
+            <!-- <template v-if="orderInfo.order.priceDetailDTO.discountPriceDetail != undefined && orderInfo.order.priceDetailDTO.discountPriceDetail && orderInfo.order.priceDetailDTO.discountPriceDetail != null && orderInfo.order.priceDetailDTO.discountPriceDetail != ''">
+                <Space style="height:20px;float: right;text-align: center;margin-left:30px;margin-right:53px;">
+                      <Button type="primary" ghost size="small" @click="getOrderPrice()">优惠详情</Button>
+                </Space>
+            </template> -->
          </li>
        </ul>
      </div>
@@ -568,6 +606,8 @@ export default {
  },
  data() {
    return {
+      typeList:[],
+      showPrices:false,
      printHiddenFlag:false,//隐藏信息
      printInfoObj:{
        id: "printInfo",//要打印的id名 无#号
@@ -804,6 +844,28 @@ export default {
        }
      });
    },
+    getOrderPrice(){
+      if(this.showPrices){
+        this.showPrices = false
+      }else if(!this.showPrices){
+        this.showPrices = true
+      }
+    },
+    getContentPrice(){
+          for (let i = 0; i < this.typeList.length; i++) {
+          for (let j = i + 1; j < this.typeList.length; j++) {
+            if (this.typeList[i].promotionId === this.typeList[j].promotionId) {
+              this.typeList[i].discountPrice = this.typeList[i].discountPrice + this.typeList[j].discountPrice
+              this.typeList.splice(j, 1)
+            }
+          }
+        }
+        console.log(this.typeList)
+        if(this.typeList.length >= 3){
+          console.log(123123)
+          this.getContentPrice()
+        }
+    },  
    //获取订单详细信息
    getDataDetail() {
      this.loading = true;
@@ -814,6 +876,9 @@ export default {
          this.allowOperation = res.result.allowOperationVO;
          this.data = res.result.orderItems;
          this.orderLogData = res.result.orderLogs;
+          this.typeList = JSON.parse(JSON.stringify(res.result.order.priceDetailDTO.discountPriceDetail));
+          this.getContentPrice()
+          this.getOrderPrice()
        }
      });
    },
@@ -1055,7 +1120,7 @@ dl dt {

  .goods-total {
    padding: 20px;
-    height: 150px;
+    height: 220px;
    width: 100%;

    ul {
@@ -1069,12 +1134,14 @@ dl dt {
    .label {
      float: left;
      width: 500px;
+      font-size: 14px;
      text-align: right;
    }

    .txt {
      float: left;
      width: 130px;
+      font-size: 14px;
      text-align: right;
      font-family: verdana;
    }
--- a/seller/src/views/shop/shopSetting.vue
+++ b/seller/src/views/shop/shopSetting.vue
@@ -50,6 +50,9 @@
            <FormItem label="店铺楼层" prop="content" class="wangEditor">
              <i-switch v-model="form.pageShow" @on-change="pageShow"></i-switch>
            </FormItem>
+            <FormItem label="开启自提" prop="content" class="wangEditor">
+              <i-switch v-model="form.selfPickFlag" @on-change="changeSelfPickFlag"></i-switch>
+            </FormItem>
            <Form-item>
              <Button
                @click="handleSubmit"
@@ -332,7 +335,8 @@ export default {
        storeAddressDetail: "", //详细地址
        storeAddressIdPath: "", //地址
        storeDesc: "", // 店铺描述
-        pageShow:false,
+        pageShow: false,
+        selfPickFlag: false,
      },

      // 表单验证规则
@@ -462,6 +466,11 @@ export default {
    pageShow(type) {
      this.form.pageShow = type
    },
+    changeSelfPickFlag(item){
+      if(item){
+        this.form.selfPickFlag = item
+      }
+    },
    getDeliverAddress(){
      API_Shop.getDeliverAddress().then(res=>{
        if(res.success){