From 4f88a14919ca07cef801605b5276cd000437ec66 Mon Sep 17 00:00:00 2001
From: liy <1492230202@qq.com>
Date: Wed, 27 Nov 2024 16:57:03 +0800
Subject: [PATCH] 1

---
 ceres-uniapp-master/pages_category_page1/coupon/1.vue             | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue | 300 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ceres-uniapp-master/pages_category_page1/coupon/list.vue          |   4 ++--
 ceres-uniapp-master/pages_category_page1/store/index.vue          | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 settled-merchant-master/src/views/moblie/mEnterprise.vue          |   2 --
 settled-merchant-master/src/views/moblie/mPersonal.vue            |   2 --
 6 files changed, 424 insertions(+), 308 deletions(-)
 create mode 100644 ceres-uniapp-master/pages_category_page1/coupon/1.vue
 delete mode 100644 ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue

diff --git a/ceres-uniapp-master/pages_category_page1/coupon/1.vue b/ceres-uniapp-master/pages_category_page1/coupon/1.vue
new file mode 100644
index 0000000..95879b1
--- /dev/null
+++ b/ceres-uniapp-master/pages_category_page1/coupon/1.vue
@@ -0,0 +1,300 @@
+<template>
+  <view class="couponList u-skeleton">
+    <Skeleton
+        el-color="#efefef"
+        bg-color="#fff"
+        :loading="loading && isFirstComeIn"
+        :animation="true"
+    />
+    <template v-if="couponList.length>0">
+      <view
+          class="couponItem u-skeleton-fillet flex-items"
+          v-for="item of couponList"
+          :key="item.couponId"
+      >
+        <view
+            class="itemLeft u-skeleton-fillet"
+            @click="goProductList(item)"
+        >
+          <view class="topIcon"></view>
+          <view class="bottomIcon"></view>
+          <view class="price flex-items">
+            <view
+                class="flex-column flex-end unitBox"
+                v-if="item.discountMode === 1"
+            >
+              <view class="unit">￥</view>
+            </view>
+            <view class="priceValue">{{ item.reduceMoney }}{{ item.discountMode === 1 ? '' : '折' }}</view>
+          </view>
+          <text class="fs24 font-color-999">满{{ item.fullMoney }}元可用</text>
+        </view>
+        <view class="itemRight u-skeleton-fillet">
+          <view class="topInfo flex-items flex-sp-between">
+            <view @click="goProductList(item)">
+              <view class="couponTit fs32 font-color-FFF">{{ item.activityName }}</view>
+              <view class="couponDate fs24 font-color-999">{{ item.endTime }}到期</view>
+            </view>
+            <view class="exchangeBtnBox flex-column flex-end">
+              <view
+                  class="exchangeBtn fs24 font-color-FFF"
+                  v-if="item.state === 0"
+              >已领取
+              </view>
+              <wx-send-coupon
+                  v-else
+                  @success="success"
+                  :couponList="[item]"
+              >
+                <view class="exchangeBtn fs24 font-color-FFF">{{ item.ifCredit ? '立即兑换' : '立即领取' }}</view>
+              </wx-send-coupon>
+            </view>
+          </view>
+          <view
+              @click="goProductList(item)"
+              class="couponType fs28 font-color-FFF"
+          >{{ item.discountMode === 1 ? '满减券' : '折扣券' }}
+          </view>
+        </view>
+      </view>
+      <!-- 触底 -->
+      <view
+          class="reachBottom"
+          v-if="topLeft > 400 && couponList.length>0"
+      >
+        <image
+            class="reach-icon"
+            src="https://jy.scjysm.asia:18086/mefile/file/static/img//reachBottom.png"
+            mode="widthFix"
+        ></image>
+        <text class="reach-text">这里到底了哦~~</text>
+      </view>
+    </template>
+    <Empty :show="couponList.length<=0" />
+  </view>
+</template>
+
+<script>
+import Skeleton from "../../components/Skeleton";
+import Empty from "../../components/Empty";
+import WxSendCoupon from "../../components/wx/wxSendCoupon";
+
+const NET = require('../../utils/request')
+const API = require('../../config/api')
+export default {
+  name: "list",
+  components: {WxSendCoupon, Empty, Skeleton},
+  data() {
+    return {
+      loading: false,
+      isFirstComeIn: true,
+      couponList: [{}, {}, {}, {}, {}, {}], // 优惠券列表getCoupons
+      page: 1,
+      pageSize: 10,
+      loadingType: 0,
+      topLeft: 0
+    }
+  },
+  onLoad() {
+    this.getCouponList()
+  },
+  onReachBottom() {
+    if (this.loadingType == 1) {
+      uni.stopPullDownRefresh()
+    } else {
+      this.page = this.page + 1
+      this.getCouponList()
+    }
+  },
+  onPageScroll(e) {
+    this.topLeft = e.scrollTop
+  },
+  methods: {
+    getCouponList() {
+      // uni.showLoading({
+      //   mask: true,
+      //   title: '加载中...'
+      // })
+      this.loading = true
+	  NET.request(API.couponnew, {
+	    page: this.page,
+	    pageSize: this.pageSize,
+		shopId:154
+	  }, 'POST').then(res => {
+	    uni.hideLoading()
+	    if (res.data.length === 0) {
+	      this.loadingType = 1
+	    } else {
+	      this.couponList = this.couponList.concat(res.data)
+	      this.$forceUpdate()
+	    }
+	    this.couponList = this.couponList.filter(item => JSON.stringify(item) !== '{}')
+	    this.loading = false
+	    this.isFirstComeIn = false
+	  }).catch(res => {
+	    uni.hideLoading()
+	  })
+      // NET.request(API.getCoupons, {
+      //   page: this.page,
+      //   pageSize: this.pageSize
+      // }, 'GET').then(res => {
+      //   uni.hideLoading()
+      //   if (res.data.list.length === 0) {
+      //     this.loadingType = 1
+      //   } else {
+      //     this.couponList = this.couponList.concat(res.data.list)
+      //     this.$forceUpdate()
+      //   }
+      //   this.couponList = this.couponList.filter(item => JSON.stringify(item) !== '{}')
+      //   this.loading = false
+      //   this.isFirstComeIn = false
+      // }).catch(res => {
+      //   uni.hideLoading()
+      // })
+    },
+    // 跳转到可用商品列表
+    goProductList(item) {
+      console.log(item, 'test')
+      uni.navigateTo({
+        url: `../coupon/product?id=${ item.couponId }&actId=${item.activityId}`
+      })
+    },
+    success() {
+      this.page = 1
+      this.couponList = []
+      this.getCouponList()
+    }
+  }
+}
+</script>
+
+<style
+    lang="scss"
+    scoped
+>
+page {
+  background: #F8F8F8;
+
+  .couponList {
+    padding: 0 20rpx 40upx;
+    margin-top: 30rpx;
+
+    .couponItem {
+      background: #333333;
+      margin-top: 40rpx;
+      padding: 25rpx 35rpx;
+      overflow: hidden;
+      background-image: url("https://jy.scjysm.asia:18086/mefile/file/static/images/borderIcon.png");
+      background-repeat: no-repeat;
+      background-size: contain;
+      background-position: right top;
+
+      .itemLeft {
+        padding-right: 10rpx;
+        position: relative;
+        border-right: 2rpx dashed #666666;
+        width: 170rpx;
+
+        .topIcon {
+          position: absolute;
+          right: -16rpx;
+          top: -50rpx;
+          width: 32rpx;
+          height: 32rpx;
+          background: #FFFFFF;
+          border-radius: 50%;
+        }
+
+        .bottomIcon {
+          position: absolute;
+          right: -16rpx;
+          bottom: -50rpx;
+          width: 32rpx;
+          height: 32rpx;
+          background: #FFFFFF;
+          border-radius: 50%;
+        }
+
+        //.price {
+        //  width: 100rpx;
+        //}
+        .unitBox {
+          height: 70rpx;
+        }
+
+        .unit {
+          color: #FFEBC4;
+          font-size: 36rpx;
+        }
+
+        .priceValue {
+          font-size: 52rpx;
+          color: #FFEBC4;
+        }
+      }
+
+      .itemRight {
+        padding-left: 45rpx;
+        flex: 1;
+
+        .topInfo {
+          padding-bottom: 10rpx;
+          border-bottom: 2rpx solid #444444;
+          margin-bottom: 10rpx;
+
+          .couponDate {
+            width: 300rpx;
+          }
+
+          .exchangeBtnBox {
+            width: 110rpx;
+            height: 70rpx;
+            text-align: center;
+
+            .exchangeBtn {
+              padding: 5rpx;
+              border: 2rpx solid #999999;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .Put-box1 {
+    .btn {
+      text-align: center;
+      margin-top: 40rpx;
+      border: 2rpx solid #333333;
+      height: 80upx;
+      line-height: 80upx;
+      width: 100%;
+      color: #333333;
+    }
+
+    .submit {
+      background-color: #333333;
+      color: #FFEBC4;
+      margin-left: 20rpx;
+    }
+  }
+}
+
+// 触底样式
+.reachBottom {
+  margin-top: 30rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .reach-icon {
+    width: 150rpx;
+    height: 150rpx;
+  }
+
+  .reach-text {
+    margin: 20rpx 0;
+    color: #CCCCCC;
+  }
+}
+</style>
diff --git a/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue b/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue
deleted file mode 100644
index c963196..0000000
--- a/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue
+++ /dev/null
@@ -1,300 +0,0 @@
-<template>
-  <view class="couponList u-skeleton">
-    <Skeleton
-        el-color="#efefef"
-        bg-color="#fff"
-        :loading="loading && isFirstComeIn"
-        :animation="true"
-    />
-    <template v-if="couponList.length>0">
-      <view
-          class="couponItem u-skeleton-fillet flex-items"
-          v-for="item of couponList"
-          :key="item.couponId"
-      >
-        <view
-            class="itemLeft u-skeleton-fillet"
-            @click="goProductList(item)"
-        >
-          <view class="topIcon"></view>
-          <view class="bottomIcon"></view>
-          <view class="price flex-items">
-            <view
-                class="flex-column flex-end unitBox"
-                v-if="item.discountMode === 1"
-            >
-              <view class="unit">￥</view>
-            </view>
-            <view class="priceValue">{{ item.reduceMoney }}{{ item.discountMode === 1 ? '' : '折' }}</view>
-          </view>
-          <text class="fs24 font-color-999">满{{ item.fullMoney }}元可用</text>
-        </view>
-        <view class="itemRight u-skeleton-fillet">
-          <view class="topInfo flex-items flex-sp-between">
-            <view @click="goProductList(item)">
-              <view class="couponTit fs32 font-color-FFF">{{ item.activityName }}</view>
-              <view class="couponDate fs24 font-color-999">{{ item.endTime }}到期</view>
-            </view>
-            <view class="exchangeBtnBox flex-column flex-end">
-              <view
-                  class="exchangeBtn fs24 font-color-FFF"
-                  v-if="item.state === 0"
-              >已领取
-              </view>
-              <wx-send-coupon
-                  v-else
-                  @success="success"
-                  :couponList="[item]"
-              >
-                <view class="exchangeBtn fs24 font-color-FFF">{{ item.ifCredit ? '立即兑换' : '立即领取' }}</view>
-              </wx-send-coupon>
-            </view>
-          </view>
-          <view
-              @click="goProductList(item)"
-              class="couponType fs28 font-color-FFF"
-          >{{ item.discountMode === 1 ? '满减券' : '折扣券' }}
-          </view>
-        </view>
-      </view>
-      <!-- 触底 -->
-      <view
-          class="reachBottom"
-          v-if="topLeft > 400 && couponList.length>0"
-      >
-        <image
-            class="reach-icon"
-            src="https://jy.scjysm.asia:18086/mefile/file/static/img//reachBottom.png"
-            mode="widthFix"
-        ></image>
-        <text class="reach-text">这里到底了哦~~</text>
-      </view>
-    </template>
-    <Empty :show="couponList.length<=0" />
-  </view>
-</template>
-
-<script>
-import Skeleton from "../../components/Skeleton";
-import Empty from "../../components/Empty";
-import WxSendCoupon from "../../components/wx/wxSendCoupon";
-
-const NET = require('../../utils/request')
-const API = require('../../config/api')
-export default {
-  name: "list",
-  components: {WxSendCoupon, Empty, Skeleton},
-  data() {
-    return {
-      loading: false,
-      isFirstComeIn: true,
-      couponList: [{}, {}, {}, {}, {}, {}], // 优惠券列表getCoupons
-      page: 1,
-      pageSize: 10,
-      loadingType: 0,
-      topLeft: 0
-    }
-  },
-  onLoad() {
-    this.getCouponList()
-  },
-  onReachBottom() {
-    if (this.loadingType == 1) {
-      uni.stopPullDownRefresh()
-    } else {
-      this.page = this.page + 1
-      this.getCouponList()
-    }
-  },
-  onPageScroll(e) {
-    this.topLeft = e.scrollTop
-  },
-  methods: {
-    getCouponList() {
-      // uni.showLoading({
-      //   mask: true,
-      //   title: '加载中...'
-      // })
-      this.loading = true
-	  NET.request(API.youhuiquan, {
-	    page: this.page,
-	    pageSize: this.pageSize,
-		shopId:154
-	  }, 'GET').then(res => {
-	    uni.hideLoading()
-	    if (res.data.length === 0) {
-	      this.loadingType = 1
-	    } else {
-	      this.couponList = this.couponList.concat(res.data)
-	      this.$forceUpdate()
-	    }
-	    this.couponList = this.couponList.filter(item => JSON.stringify(item) !== '{}')
-	    this.loading = false
-	    this.isFirstComeIn = false
-	  }).catch(res => {
-	    uni.hideLoading()
-	  })
-      // NET.request(API.getCoupons, {
-      //   page: this.page,
-      //   pageSize: this.pageSize
-      // }, 'GET').then(res => {
-      //   uni.hideLoading()
-      //   if (res.data.list.length === 0) {
-      //     this.loadingType = 1
-      //   } else {
-      //     this.couponList = this.couponList.concat(res.data.list)
-      //     this.$forceUpdate()
-      //   }
-      //   this.couponList = this.couponList.filter(item => JSON.stringify(item) !== '{}')
-      //   this.loading = false
-      //   this.isFirstComeIn = false
-      // }).catch(res => {
-      //   uni.hideLoading()
-      // })
-    },
-    // 跳转到可用商品列表
-    goProductList(item) {
-      console.log(item, 'test')
-      uni.navigateTo({
-        url: `../coupon/product?id=${ item.couponId }&actId=${item.activityId}`
-      })
-    },
-    success() {
-      this.page = 1
-      this.couponList = []
-      this.getCouponList()
-    }
-  }
-}
-</script>
-
-<style
-    lang="scss"
-    scoped
->
-page {
-  background: #F8F8F8;
-
-  .couponList {
-    padding: 0 20rpx 40upx;
-    margin-top: 30rpx;
-
-    .couponItem {
-      background: #333333;
-      margin-top: 40rpx;
-      padding: 25rpx 35rpx;
-      overflow: hidden;
-      background-image: url("https://jy.scjysm.asia:18086/mefile/file/static/images/borderIcon.png");
-      background-repeat: no-repeat;
-      background-size: contain;
-      background-position: right top;
-
-      .itemLeft {
-        padding-right: 10rpx;
-        position: relative;
-        border-right: 2rpx dashed #666666;
-        width: 170rpx;
-
-        .topIcon {
-          position: absolute;
-          right: -16rpx;
-          top: -50rpx;
-          width: 32rpx;
-          height: 32rpx;
-          background: #FFFFFF;
-          border-radius: 50%;
-        }
-
-        .bottomIcon {
-          position: absolute;
-          right: -16rpx;
-          bottom: -50rpx;
-          width: 32rpx;
-          height: 32rpx;
-          background: #FFFFFF;
-          border-radius: 50%;
-        }
-
-        //.price {
-        //  width: 100rpx;
-        //}
-        .unitBox {
-          height: 70rpx;
-        }
-
-        .unit {
-          color: #FFEBC4;
-          font-size: 36rpx;
-        }
-
-        .priceValue {
-          font-size: 52rpx;
-          color: #FFEBC4;
-        }
-      }
-
-      .itemRight {
-        padding-left: 45rpx;
-        flex: 1;
-
-        .topInfo {
-          padding-bottom: 10rpx;
-          border-bottom: 2rpx solid #444444;
-          margin-bottom: 10rpx;
-
-          .couponDate {
-            width: 300rpx;
-          }
-
-          .exchangeBtnBox {
-            width: 110rpx;
-            height: 70rpx;
-            text-align: center;
-
-            .exchangeBtn {
-              padding: 5rpx;
-              border: 2rpx solid #999999;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .Put-box1 {
-    .btn {
-      text-align: center;
-      margin-top: 40rpx;
-      border: 2rpx solid #333333;
-      height: 80upx;
-      line-height: 80upx;
-      width: 100%;
-      color: #333333;
-    }
-
-    .submit {
-      background-color: #333333;
-      color: #FFEBC4;
-      margin-left: 20rpx;
-    }
-  }
-}
-
-// 触底样式
-.reachBottom {
-  margin-top: 30rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .reach-icon {
-    width: 150rpx;
-    height: 150rpx;
-  }
-
-  .reach-text {
-    margin: 20rpx 0;
-    color: #CCCCCC;
-  }
-}
-</style>
diff --git a/ceres-uniapp-master/pages_category_page1/coupon/list.vue b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
index 95879b1..c963196 100644
--- a/ceres-uniapp-master/pages_category_page1/coupon/list.vue
+++ b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
@@ -116,11 +116,11 @@ export default {
       //   title: '加载中...'
       // })
       this.loading = true
-	  NET.request(API.couponnew, {
+	  NET.request(API.youhuiquan, {
 	    page: this.page,
 	    pageSize: this.pageSize,
 		shopId:154
-	  }, 'POST').then(res => {
+	  }, 'GET').then(res => {
 	    uni.hideLoading()
 	    if (res.data.length === 0) {
 	      this.loadingType = 1
diff --git a/ceres-uniapp-master/pages_category_page1/store/index.vue b/ceres-uniapp-master/pages_category_page1/store/index.vue
index 86abd65..a49dd92 100644
--- a/ceres-uniapp-master/pages_category_page1/store/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/store/index.vue
@@ -53,6 +53,20 @@
 						<image src="https://jy.scjysm.asia:18086/mefile/file/static/images/arrowRight.png"></image>
 					</view>
 				</view>
+				<scroll-view style="white-space: nowrap;width: 100%;" scroll-x="true">
+					<view style="display: inline-block;" v-for="item of 10" @click="couponshow = true">
+						<view class="couponItem u-skeleton-fillet flex-items" style="margin-right: 20rpx;width: 130rpx;" >
+							<view style="color: #FFEBC4;font-size: 22rpx;">
+								3折
+							</view>
+							<view style=" border-right: 2rpx dashed #fff;height: 20rpx;margin: 0 10rpx;"></view>
+							<view style="color: #fff;font-size: 22rpx;">
+								领取
+							</view>
+						</view>
+					</view>
+					
+				</scroll-view>
 			</view>
 			<view class="shopContent">
 				<view class="tabs-nav-warp">
@@ -162,6 +176,32 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="couponshow" mode="bottom" border-radius="14" @close="couponshow =false">
+			<view style="background: #f3f3f3;">
+				<view style="text-align: center;padding: 30rpx 0;">免费领</view>
+				<view style="height: 500rpx;overflow-y: scroll;padding: 0 30rpx;">
+					<view v-for="(item,index) in 5" style="display: flex;align-items: center;justify-content: space-between;padding:10rpx 20rpx;background: #fff;margin-bottom: 25rpx;border-radius: 18rpx;">
+						<view style="display: flex;">
+							<view>
+								<image :src="storeInfo.shopLogo" style="width: 100rpx;height: 100rpx;"></image>
+							</view>
+							<view style="height: 100rpx;display: flex;flex-direction: column;justify-content: space-around;margin-left: 10rpx;">
+								<view style="font-size: 26rpx;">
+									<span style="color: red;margin-right: 5rpx;">￥2</span>
+									代金券
+								</view>
+								<view style="font-size: 22rpx;color: #909090;">
+									有效期2024.12.1
+								</view>
+							</view>
+						</view>
+						<view style="color: red;font-size: 26rpx;">领取</view>
+					</view>
+					
+				</view>
+				<view style="height: 10rpx;"></view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -173,6 +213,7 @@
 	export default {
 		data() {
 			return {
+				couponshow:false,
 				componentsData: [],
 				navIndex: 0,
 				id: '',
@@ -611,7 +652,86 @@
 	page {
 		background: #F8F8F8;
 	}
-
+	.couponItem {
+	  background: #333333;
+	  margin-top: 20rpx;
+	  padding: 10rpx;
+	  overflow: hidden;
+	  background-image: url("https://jy.scjysm.asia:18086/mefile/file/static/images/borderIcon.png");
+	  background-repeat: no-repeat;
+	  background-size: contain;
+	  background-position: right top;
+	
+	  .itemLeft {
+	    padding-right: 10rpx;
+	    position: relative;
+	    border-right: 2rpx dashed #666666;
+	    /* width: 170rpx; */
+	
+	    .topIcon {
+	      position: absolute;
+	      right: -16rpx;
+	      top: -50rpx;
+	      width: 32rpx;
+	      height: 32rpx;
+	      background: #FFFFFF;
+	      border-radius: 50%;
+	    }
+	
+	    .bottomIcon {
+	      position: absolute;
+	      right: -16rpx;
+	      bottom: -50rpx;
+	      width: 32rpx;
+	      height: 32rpx;
+	      background: #FFFFFF;
+	      border-radius: 50%;
+	    }
+	
+	    //.price {
+	    //  width: 100rpx;
+	    //}
+	    .unitBox {
+	      height: 70rpx;
+	    }
+	
+	    .unit {
+	      color: #FFEBC4;
+	      font-size: 36rpx;
+	    }
+	
+	    .priceValue {
+	      font-size: 22rpx;
+	      color: #FFEBC4;
+	    }
+	  }
+	
+	  .itemRight {
+	    /* padding-left: 45rpx; */
+	    flex: 1;
+	
+	    .topInfo {
+	      padding-bottom: 10rpx;
+	      border-bottom: 2rpx solid #444444;
+	      margin-bottom: 10rpx;
+	
+	      .couponDate {
+	        width: 300rpx;
+	      }
+	
+	      .exchangeBtnBox {
+	        width: 110rpx;
+	        height: 70rpx;
+	        text-align: center;
+	
+	        .exchangeBtn {
+	          padding: 5rpx;
+	          border: 2rpx solid #999999;
+	        }
+	      }
+	    }
+	  }
+	}
 	.shop-top {
 		background: #39be7a;
 		display: flex;
@@ -629,7 +749,7 @@
 
 	// #endif
 	.stopInfo {
-		padding: 200rpx 20rpx 20rpx 20rpx;
+		padding: 140rpx 20rpx 20rpx 20rpx;
 		background: #F8F8F8;
 	}
 
diff --git a/settled-merchant-master/src/views/moblie/mEnterprise.vue b/settled-merchant-master/src/views/moblie/mEnterprise.vue
index e5be6e4..f965852 100644
--- a/settled-merchant-master/src/views/moblie/mEnterprise.vue
+++ b/settled-merchant-master/src/views/moblie/mEnterprise.vue
@@ -801,6 +801,4 @@ export default {
   text-align: center;
   background: rgba(0, 0, 0, 0.3);
 }
-
-
 </style>
diff --git a/settled-merchant-master/src/views/moblie/mPersonal.vue b/settled-merchant-master/src/views/moblie/mPersonal.vue
index 7f75eee..68aaa23 100644
--- a/settled-merchant-master/src/views/moblie/mPersonal.vue
+++ b/settled-merchant-master/src/views/moblie/mPersonal.vue
@@ -666,6 +666,4 @@ export default {
   text-align: center;
   background: rgba(0, 0, 0, 0.3);
 }
-
-
 </style>
--
libgit2 0.21.4