From 9bdadd152e81119638301f85f98bdabd106c5e19 Mon Sep 17 00:00:00 2001
From: wqy <1191068887@qq.com>
Date: Tue, 23 Jul 2024 15:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ums/member.js              |  13 +-
 src/components/SeeAdsComponent.vue |  70 +++++
 src/style/base.styl                |   3 +-
 src/views/index.vue                |   2 +-
 src/views/oms/aftersale/index.vue  | 232 ++++++++--------
 src/views/oms/order/index.vue      | 410 +++++++++++++++--------------
 src/views/pms/product/index.vue    | 253 +++++++++---------
 src/views/ums/member/index.vue     | 240 +++++++++--------
 8 files changed, 674 insertions(+), 549 deletions(-)
 create mode 100644 src/components/SeeAdsComponent.vue

diff --git a/src/api/ums/member.js b/src/api/ums/member.js
index 276bbd0..7f46e44 100644
--- a/src/api/ums/member.js
+++ b/src/api/ums/member.js
@@ -85,10 +85,19 @@ export function viewStatistics(memberId){
   })
 }
 
-export function getMiniWechatImg(){
+export function getMiniWechatImg(params){
   return request({
     url: `/ums/member/wechat/code`,
-    method: 'get'
+    method: 'get',
+    params
+  })
+}
+
+export function judgeQrCode(params){
+  return request({
+    url: `/no-auth/verified/code`,
+    method: 'get',
+    params
   })
 }
 
diff --git a/src/components/SeeAdsComponent.vue b/src/components/SeeAdsComponent.vue
new file mode 100644
index 0000000..696e533
--- /dev/null
+++ b/src/components/SeeAdsComponent.vue
@@ -0,0 +1,70 @@
+<template>
+  <el-dialog title="扫描解锁" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <p>使用微信扫描下方二维码，观看完广告获取验证码</p>
+    <p class="red f13">注：如果第一次扫码未弹出广告，请重新扫码进入</p>
+    <div class="flex-center">
+      <el-image class="qr-code"
+        :src="'data:image/png;base64,'+ miniImg"
+        fit="fill"
+      ></el-image>
+      <el-input v-model="qrCode" class="left-input"/>
+      <el-button @click="asyncOk" class="right-btn" type="primary" :disabled="!qrCode">提交</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import {getMiniWechatImg, judgeQrCode} from "@/api/ums/member";
+import {mapGetters} from "vuex";
+
+export default {
+  computed: {
+    ...mapGetters(['roles'])
+  },
+  data() {
+    return {
+      open: false,
+      miniImg: null,
+      qrCode: null
+    }
+  },
+  methods: {
+    initMiniWechatImg() {
+      getMiniWechatImg({scene: 2}).then(res => {
+        this.miniImg = res.data
+      })
+    },
+    show() {
+      //如果是管理员的账号进入，直接过滤
+      if (this.roles.includes("admin")) {
+        this.$emit("confirmOk", true)
+        return
+      }
+      this.initMiniWechatImg()
+      this.open = true
+    },
+    async asyncOk(){
+      const res = await judgeQrCode({code: this.qrCode}).then(res=>{
+        return res.data
+      })
+      if (res) {
+        this.open = false
+      } else {
+        this.$message.error('验证码错误')
+      }
+      this.$emit("confirmOk", res)
+    }
+  }
+}
+</script>
+
+<style lang="stylus">
+.qr-code
+  min-width 150px
+  height 150px
+  margin 20px 20px 20px 0
+.left-input
+  .el-input__inner
+    border-radius 4px 0 0 4px !important
+.right-btn
+  border-radius 0 4px 4px 0 !important
+</style>
diff --git a/src/style/base.styl b/src/style/base.styl
index a6edb45..787a876 100644
--- a/src/style/base.styl
+++ b/src/style/base.styl
@@ -174,7 +174,8 @@ body
   width 100%
 .bolder-font
   font-weight bolder
-
+.f13
+  font-size 13px
 .large-tip
   font-size 16px
 .dialog-form-two
diff --git a/src/views/index.vue b/src/views/index.vue
index 451a25e..00546e9 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -251,7 +251,7 @@ export default {
   },
   methods: {
     initMiniWechatImg() {
-      getMiniWechatImg().then(res => {
+      getMiniWechatImg({scene: 1}).then(res => {
         this.miniImg = res.data
       })
     },
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 44a7bbe..378a5c5 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -1,114 +1,115 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
-      <el-form-item label="申请状态" prop="status">
-        <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_aftersale_status" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
-      </el-form-item>
-      <el-form-item label="售后类型" prop="type">
-        <DictRadio v-model="queryParams.type" :radioData="dict.type.oms_aftersale_type" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
-      </el-form-item>
-      <el-form-item label="订单号" prop="orderSn">
-        <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small"
-                  @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="售后单号" prop="id">
-        <el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable size="small"
-                  @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="会员手机号" prop="userPhone">
-        <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small"
-                  @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="Time">
-        <el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions"
-                        range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
-                        align="right"
-                        @change="handleChange">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange" border>
-      <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="售后单号" prop="id" width="160"/>
-      <el-table-column label="申请状态" prop="aftersaleStatus" width="80">
-        <template v-slot="scope">
-          <el-tag effect="plain" size="medium" :type="getAftersaleStatusTag(scope.row)">{{
-              getAftersaleStatusText(scope.row)
-            }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="用户信息" prop="nickName" width="120">
-        <template v-slot="scope">
-          <div>{{ scope.row.nickName }}</div>
-          <div>{{ scope.row.phone }}</div>
-          <div>{{ scope.row.mark }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="退款金额" prop="applyReturnAmount" width="120"/>
-      <el-table-column label="售后类型" prop="applyRefundType" width="80">
-        <template v-slot="scope">
-          <el-tag effect="plain" size="medium" :type="getAftersaleTypeTag(scope.row)">{{
-              getAftersaleTypeText(scope.row)
-            }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请时间" prop="applyRefundTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.applyRefundTime, '') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="处理时间" prop="handleTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.handleTime, '') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="原因" prop="reason" width="220"/>
-      <el-table-column label="处理备注" prop="note" width="150"/>
-      <el-table-column label="处理人员" prop="handleMan" width="100"/>
-      <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.orderSn }}
-            <el-link @click="copy(scope.row.orderSn)" :underline="false"><i
-              class="el-icon-document-copy el-icon--right"></i></el-link>
-          </div>
-          <el-button size="mini" type="text" @click="handleDetail(scope.row.orderId)"
-                     v-hasPermi="['oms:aftersale:query']">详情
-          </el-button>
-          <el-button size="mini" type="text" @click="showLog(scope.row.orderId)"
-                     v-hasPermi="['oms:aftersale:log']">日志
-          </el-button>
-          <el-button size="mini" type="text" @click="approve(scope.row, 1)"
-                     v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">同意
-          </el-button>
-          <el-button size="mini" type="text" @click="handleOpen(scope.row, 2)" class="red"
-                     v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">拒绝
-          </el-button>
-          <el-button size="mini" type="text" @click="confirmReceive(scope.row, 3)"
-                     v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2"
-                     v-hasPermi="['manager:oms:aftersale:update']">确认收货
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <InBody v-show="total>0">
-      <pagination
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </InBody>
+    <div v-show="show">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+        <el-form-item label="申请状态" prop="status">
+          <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_aftersale_status" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
+        </el-form-item>
+        <el-form-item label="售后类型" prop="type">
+          <DictRadio v-model="queryParams.type" :radioData="dict.type.oms_aftersale_type" size="small" :show-all="'all'" @change="handleQuery"></DictRadio>
+        </el-form-item>
+        <el-form-item label="订单号" prop="orderSn">
+          <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="售后单号" prop="id">
+          <el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="会员手机号" prop="userPhone">
+          <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="Time">
+          <el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions"
+                          range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
+                          align="right"
+                          @change="handleChange">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange" border>
+        <!--      <el-table-column type="selection" width="55" align="center" />-->
+        <el-table-column label="售后单号" prop="id" width="160"/>
+        <el-table-column label="申请状态" prop="aftersaleStatus" width="80">
+          <template v-slot="scope">
+            <el-tag effect="plain" size="medium" :type="getAftersaleStatusTag(scope.row)">{{
+                getAftersaleStatusText(scope.row)
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户信息" prop="nickName" width="120">
+          <template v-slot="scope">
+            <div>{{ scope.row.nickName }}</div>
+            <div>{{ scope.row.phone }}</div>
+            <div>{{ scope.row.mark }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="退款金额" prop="applyReturnAmount" width="120"/>
+        <el-table-column label="售后类型" prop="applyRefundType" width="80">
+          <template v-slot="scope">
+            <el-tag effect="plain" size="medium" :type="getAftersaleTypeTag(scope.row)">{{
+                getAftersaleTypeText(scope.row)
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" prop="applyRefundTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.applyRefundTime, '') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="处理时间" prop="handleTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.handleTime, '') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="原因" prop="reason" width="220"/>
+        <el-table-column label="处理备注" prop="note" width="150"/>
+        <el-table-column label="处理人员" prop="handleMan" width="100"/>
+        <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.orderSn }}
+              <el-link @click="copy(scope.row.orderSn)" :underline="false"><i
+                class="el-icon-document-copy el-icon--right"></i></el-link>
+            </div>
+            <el-button size="mini" type="text" @click="handleDetail(scope.row.orderId)"
+                       v-hasPermi="['oms:aftersale:query']">详情
+            </el-button>
+            <el-button size="mini" type="text" @click="showLog(scope.row.orderId)"
+                       v-hasPermi="['oms:aftersale:log']">日志
+            </el-button>
+            <el-button size="mini" type="text" @click="approve(scope.row, 1)"
+                       v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">同意
+            </el-button>
+            <el-button size="mini" type="text" @click="handleOpen(scope.row, 2)" class="red"
+                       v-if="scope.row.aftersaleStatus == 0" v-hasPermi="['manager:oms:aftersale:update']">拒绝
+            </el-button>
+            <el-button size="mini" type="text" @click="confirmReceive(scope.row, 3)"
+                       v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2"
+                       v-hasPermi="['manager:oms:aftersale:update']">确认收货
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <InBody v-show="total>0">
+        <pagination
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </InBody>
+    </div>
+    <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>
 
     <!-- 拒绝对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -151,12 +152,15 @@ import {
   viewLog
 } from "@/api/oms/aftersale";
 import dateUtil from '@/utils/DateUtil';
+import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
 
 export default {
   name: "OmsAftersale",
+  components: {SeeAdsComponent},
   dicts: ["oms_aftersale_type", "oms_aftersale_status"],
   data() {
     return {
+      show: false,
       pickerOptions: {
         shortcuts: dateUtil.getTimeShort2()
       },
@@ -219,9 +223,17 @@ export default {
     if (status){
       this.queryParams.status = status
     }
-    this.getList();
+    this.$nextTick(()=>{
+      this.$refs.seeAdsComponentRef.show()
+    })
   },
   methods: {
+    confirmOk(success) {
+      if (success) {
+        this.show = true
+        this.getList();
+      }
+    },
     copy(data) {
       let url = data;
       let oInput = document.createElement('input');
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 218c4d6..0a5d220 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -1,193 +1,192 @@
 <template>
-  <div class="app-container" v-if="show">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium"
-             class="ry_form">
-      <el-form-item label="订单状态" prop="status">
-        <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_order_status" size="small" :show-all="'all'"
-                   :filter="['11', '12', '13', '14']" @change="handleQuery"></DictRadio>
-      </el-form-item>
-      <el-form-item label="订单编号" prop="orderSn">
-        <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable size="small"
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="会员手机号" prop="userPhone">
-        <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small"
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="省市区" prop="provinces">
-        <address-selector v-model="queryParams.provinces" size="small"></address-selector>
-      </el-form-item>
-      <el-form-item label="下单时间" prop="Time">
-        <el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions"
-                        range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
-                        align="right"
-                        @change="handleChange">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="omsOrderList" border @selection-change="handleSelectionChange"
-              cell-class-name="my-cell">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="收件信息" prop="receiverName" width="280">
-        <template v-slot="scope">
-          <div>
-            <span>{{ scope.row.decrypt?scope.row.receiverName:getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}</span>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleWatch(scope.row)"
-              style="margin-left: 10px"
-            >查看
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改
-            </el-button>
-          </div>
-          <div>
-            <span>{{ scope.row.receiverProvince }}{{ scope.row.receiverCity }}{{ scope.row.receiverDistrict }}</span>
-            <span>{{ scope.row.decrypt?scope.row.receiverDetailAddress:getHiddenDetailAddress(scope.row.receiverDetailAddress) }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="客户信息" prop="receiverName" width="160">
-        <template v-slot="scope">
-          <p>{{ scope.row.nickName }}</p>
-          <p>{{ scope.row.mark }}</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注留言" prop="note" width="160">
-        <template v-slot="scope">
-          <div>
-            <span v-if="scope.row.merchantNote" class="note-title" style="margin-right: 10px">平台备注</span>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSaveNote(scope.row)"
-            >{{ scope.row.merchantNote ? '修改' : '添加平台备注' }}
-            </el-button>
-          </div>
-          <div v-if="scope.row.merchantNote">{{ scope.row.merchantNote }}</div>
-          <div v-if="scope.row.note" class="note-title">买家备注</div>
-          <div v-if="scope.row.note">{{ scope.row.note }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="下单时间/支付时间" prop="payTime" width="140">
-        <template slot-scope="scope">
-          <div v-if="scope.row.createTime">{{ parseTime(scope.row.createTime, '{mm}-{dd} {hh}:{ii}') }} 下单</div>
-          <div v-if="scope.row.payTime">{{ parseTime(scope.row.payTime, '{mm}-{dd} {hh}:{ii}') }} 支付</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="优惠券" prop="couponAmount" width="80">
-        <template v-slot="scope">
-          <div v-if="scope.row.couponAmount">￥{{ scope.row.couponAmount }}</div>
-          <div v-else>无</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="合计" prop="totalAmount" width="140">
-        <template v-slot="scope">
-          <div>
-            <span>总数： </span>
-            <span style="color: red;">{{ scope.row.buyNum }}</span>
-          </div>
-          <div>实付： ￥{{ scope.row.payAmount }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品规格" prop="productList" width="280">
-        <template v-slot="scope">
-          <div v-for="item in scope.row.productList" class="product-container">
-            <el-popover
-              placement="right"
-              trigger="hover">
-              <el-image :src="item.pic" style="width: 350px;height: 350px"/>
-              <el-image slot="reference" class="small-img product-item" :src="item.pic"
-                        style="width: 40px;height: 40px"/>
-            </el-popover>
-            <div class="product-item" style="margin-left: 5px">
-              <div class="sp-data">
-                <span v-for="(value, key) in JSON.parse(item.spData)">{{ key }}：{{ value }}&nbsp;</span>
-              </div>
-              <div class="product-item quantity">
-                <span style="margin-right: 10px">￥{{ item.salePrice }}</span>
-                <span>x{{ item.buyNum }}</span>
+  <div class="app-container">
+    <div v-show="show">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium"
+               class="ry_form">
+        <el-form-item label="订单状态" prop="status">
+          <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_order_status" size="small" :show-all="'all'"
+                     :filter="['11', '12', '13', '14']" @change="handleQuery"></DictRadio>
+        </el-form-item>
+        <el-form-item label="订单编号" prop="orderSn">
+          <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable size="small"
+                    @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="会员手机号" prop="userPhone">
+          <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small"
+                    @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="省市区" prop="provinces">
+          <address-selector v-model="queryParams.provinces" size="small"></address-selector>
+        </el-form-item>
+        <el-form-item label="下单时间" prop="Time">
+          <el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions"
+                          range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
+                          align="right"
+                          @change="handleChange">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loading" :data="omsOrderList" border @selection-change="handleSelectionChange"
+                cell-class-name="my-cell">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="收件信息" prop="receiverName" width="280">
+          <template v-slot="scope">
+            <div>
+              <span>{{ scope.row.decrypt?scope.row.receiverName:getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}</span>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleWatch(scope.row)"
+                style="margin-left: 10px"
+              >查看
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+            </div>
+            <div>
+              <span>{{ scope.row.receiverProvince }}{{ scope.row.receiverCity }}{{ scope.row.receiverDistrict }}</span>
+              <span>{{ scope.row.decrypt?scope.row.receiverDetailAddress:getHiddenDetailAddress(scope.row.receiverDetailAddress) }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户信息" prop="receiverName" width="160">
+          <template v-slot="scope">
+            <p>{{ scope.row.nickName }}</p>
+            <p>{{ scope.row.mark }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注留言" prop="note" width="160">
+          <template v-slot="scope">
+            <div>
+              <span v-if="scope.row.merchantNote" class="note-title" style="margin-right: 10px">平台备注</span>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleSaveNote(scope.row)"
+              >{{ scope.row.merchantNote ? '修改' : '添加平台备注' }}
+              </el-button>
+            </div>
+            <div v-if="scope.row.merchantNote">{{ scope.row.merchantNote }}</div>
+            <div v-if="scope.row.note" class="note-title">买家备注</div>
+            <div v-if="scope.row.note">{{ scope.row.note }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="下单时间/支付时间" prop="payTime" width="140">
+          <template slot-scope="scope">
+            <div v-if="scope.row.createTime">{{ parseTime(scope.row.createTime, '{mm}-{dd} {hh}:{ii}') }} 下单</div>
+            <div v-if="scope.row.payTime">{{ parseTime(scope.row.payTime, '{mm}-{dd} {hh}:{ii}') }} 支付</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券" prop="couponAmount" width="80">
+          <template v-slot="scope">
+            <div v-if="scope.row.couponAmount">￥{{ scope.row.couponAmount }}</div>
+            <div v-else>无</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="合计" prop="totalAmount" width="140">
+          <template v-slot="scope">
+            <div>
+              <span>总数： </span>
+              <span style="color: red;">{{ scope.row.buyNum }}</span>
+            </div>
+            <div>实付： ￥{{ scope.row.payAmount }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品规格" prop="productList" width="280">
+          <template v-slot="scope">
+            <div v-for="item in scope.row.productList" class="product-container">
+              <el-popover
+                placement="right"
+                trigger="hover">
+                <el-image :src="item.pic" style="width: 350px;height: 350px"/>
+                <el-image slot="reference" class="small-img product-item" :src="item.pic"
+                          style="width: 40px;height: 40px"/>
+              </el-popover>
+              <div class="product-item" style="margin-left: 5px">
+                <div class="sp-data">
+                  <span v-for="(value, key) in JSON.parse(item.spData)">{{ key }}：{{ value }}&nbsp;</span>
+                </div>
+                <div class="product-item quantity">
+                  <span style="margin-right: 10px">￥{{ item.salePrice }}</span>
+                  <span>x{{ item.buyNum }}</span>
+                </div>
               </div>
             </div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单状态" prop="status" width="160">
-        <template v-slot="scope">
-          <div>
-            <el-tag :type="getOrderStatusTag(scope.row.status)" style="margin-right: 10px">
-              {{ getOrderStatusText(scope.row.status) }}
-            </el-tag>
-          </div>
-          <div v-if="scope.row.deliverySn">物流单号：{{ scope.row.deliverySn }}
-            <el-link @click="copy(scope.row.deliverySn)" :underline="false"><i
-              class="el-icon-document-copy el-icon--right"></i></el-link>
-          </div>
-          <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right" >
-        <template slot-scope="scope" >
-          <div style="float: right">
-            {{ scope.row.orderSn }}
-            <!--            <el-link-->
-            <!--              size="mini"-->
-            <!--              icon="el-icon-document-copy"-->
-            <!--              @click="copyOrderSn(scope.row.orderSn)"-->
-            <!--            ></el-link>-->
-            <el-link @click="copy(scope.row.orderSn)" :underline="false"><i
-              class="el-icon-document-copy el-icon--right"></i></el-link>
-          </div>
-          <div style="float: right">
-            <el-button
-              size="mini"
-              type="text"
-              @click="goDetail(scope.row)"
-              v-hasPermi="['oms:order:query']"
-            >详情
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="showLog(scope.row.id)"
-              v-hasPermi="['oms:order:log']"
-            >日志
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDelivery(scope.row)"
-              :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
-            >发货
-            </el-button>
-          </div>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <InBody v-show="total>0">
-      <pagination
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </InBody>
-
+          </template>
+        </el-table-column>
+        <el-table-column label="订单状态" prop="status" width="160">
+          <template v-slot="scope">
+            <div>
+              <el-tag :type="getOrderStatusTag(scope.row.status)" style="margin-right: 10px">
+                {{ getOrderStatusText(scope.row.status) }}
+              </el-tag>
+            </div>
+            <div v-if="scope.row.deliverySn">物流单号：{{ scope.row.deliverySn }}
+              <el-link @click="copy(scope.row.deliverySn)" :underline="false"><i
+                class="el-icon-document-copy el-icon--right"></i></el-link>
+            </div>
+            <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right" >
+          <template slot-scope="scope" >
+            <div style="float: right">
+              {{ scope.row.orderSn }}
+              <!--            <el-link-->
+              <!--              size="mini"-->
+              <!--              icon="el-icon-document-copy"-->
+              <!--              @click="copyOrderSn(scope.row.orderSn)"-->
+              <!--            ></el-link>-->
+              <el-link @click="copy(scope.row.orderSn)" :underline="false"><i
+                class="el-icon-document-copy el-icon--right"></i></el-link>
+            </div>
+            <div style="float: right">
+              <el-button
+                size="mini"
+                type="text"
+                @click="goDetail(scope.row)"
+                v-hasPermi="['oms:order:query']"
+              >详情
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="showLog(scope.row.id)"
+                v-hasPermi="['oms:order:log']"
+              >日志
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDelivery(scope.row)"
+                :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
+              >发货
+              </el-button>
+            </div>
 
+          </template>
+        </el-table-column>
+      </el-table>
+      <InBody v-show="total>0">
+        <pagination
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </InBody>
+    </div>
+    <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>
     <!-- 发货对话框 -->
     <el-dialog :title="deliveryObj.title" :visible.sync="deliveryObj.open" width="500px" append-to-body>
       <el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">
@@ -285,6 +284,7 @@ import AddressSelector from "@/views/components/AddressSelector/index.vue";
 import dateUtil, {dateFormat} from '@/utils/DateUtil';
 import {isStarRepo} from "@/utils/is-star-plugin"
 import {mapGetters} from "vuex";
+import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
 
 export default {
   computed:{
@@ -293,6 +293,7 @@ export default {
   name: "OmsOrder",
   dicts: ["oms_order_status", "oms_pay_type"],
   components: {
+    SeeAdsComponent,
     AddressSelector
   },
   data() {
@@ -411,23 +412,30 @@ export default {
     };
   },
   async created() {
-    const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/order/order', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
-    this.show = res;
-    if (res) {
-      const {phone, status, today} = this.$route.query
-      if (phone) {
-        this.queryParams.userPhone = phone
-      }
-      if (status) {
-        this.queryParams.status = status
-      }
-      if (today) {
-        this.setToday()
-      }
-      this.getList();
-    }
+    this.$nextTick(()=>{
+      this.$refs.seeAdsComponentRef.show()
+    })
   },
   methods: {
+    async confirmOk(success) {
+      if (success) {
+        const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/order/order', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
+        this.show = res;
+        if (res) {
+          const {phone, status, today} = this.$route.query
+          if (phone) {
+            this.queryParams.userPhone = phone
+          }
+          if (status) {
+            this.queryParams.status = status
+          }
+          if (today) {
+            this.setToday()
+          }
+          this.getList();
+        }
+      }
+    },
     /** 日期组件设置为今天 */
     setToday() {
       const temp = new Date();
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index 4e122a1..c515f75 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -1,122 +1,126 @@
 <template>
-  <div class="app-container" v-if="show">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
-      <el-form-item label="上架状态" prop="publishStatus">
-         <DictRadio v-model="queryParams.publishStatus" @change="handleQuery" size="small"
-                   :radioData="dict.type.pms_publish_status" :showAll="'all'"/>
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.nameLike"
-          placeholder="请输入商品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="品牌" prop="brandName">
-        <el-input
-          v-model="queryParams.brandNameLike"
-          placeholder="请输入品牌名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分类" prop="productCategoryName">
-        <el-input
-          v-model="queryParams.productCategoryNameLike"
-          placeholder="请输入分类名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="编码" prop="outProductId">
-        <el-input
-          v-model="queryParams.outProductId"
-          placeholder="请输入商品编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+  <div class="app-container">
+    <div v-show="show">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+        <el-form-item label="上架状态" prop="publishStatus">
+          <DictRadio v-model="queryParams.publishStatus" @change="handleQuery" size="small"
+                     :radioData="dict.type.pms_publish_status" :showAll="'all'"/>
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input
+            v-model="queryParams.nameLike"
+            placeholder="请输入商品名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="品牌" prop="brandName">
+          <el-input
+            v-model="queryParams.brandNameLike"
+            placeholder="请输入品牌名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="分类" prop="productCategoryName">
+          <el-input
+            v-model="queryParams.productCategoryNameLike"
+            placeholder="请输入分类名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="编码" prop="outProductId">
+          <el-input
+            v-model="queryParams.outProductId"
+            placeholder="请输入商品编码"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-
-        >新增</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="pmsProductList" @selection-change="handleSelectionChange" border>
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="主图" prop="pic">
-        <template slot-scope="{ row }">
-          <el-image v-if="row.pic" :src="row.pic" :preview-src-list="[row.pic]" class="small-img"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="名称/编码" min-width="200" prop="outProductId">
-        <template slot-scope="{ row }">
-          <div>名称：{{ row.name }}</div>
-          <div v-if="row.outProductId">编码：{{ row.outProductId }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="品牌/分类" prop="brandName">
-        <template slot-scope="{ row }">
-          <div v-if="row.brandName">品牌：{{ row.brandName }}</div>
-          <div v-if="row.productCategoryName">分类：{{ row.productCategoryName }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="价格/排序" prop="price">
-        <template slot-scope="{ row }">
-          <div v-if="row.price">价格：{{ row.price }}</div>
-          <div v-if="row.sort">排序：{{ row.sort }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="上架状态" prop="publishStatus">
-        <template slot-scope="{ row }">
-          <dict-tag :value="row.publishStatus" prop-name="pms_publish_status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改
-          </el-button>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
             size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+            @click="handleAdd"
+
+          >新增</el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="pmsProductList" @selection-change="handleSelectionChange" border>
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="主图" prop="pic">
+          <template slot-scope="{ row }">
+            <el-image v-if="row.pic" :src="row.pic" :preview-src-list="[row.pic]" class="small-img"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="名称/编码" min-width="200" prop="outProductId">
+          <template slot-scope="{ row }">
+            <div>名称：{{ row.name }}</div>
+            <div v-if="row.outProductId">编码：{{ row.outProductId }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="品牌/分类" prop="brandName">
+          <template slot-scope="{ row }">
+            <div v-if="row.brandName">品牌：{{ row.brandName }}</div>
+            <div v-if="row.productCategoryName">分类：{{ row.productCategoryName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格/排序" prop="price">
+          <template slot-scope="{ row }">
+            <div v-if="row.price">价格：{{ row.price }}</div>
+            <div v-if="row.sort">排序：{{ row.sort }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="上架状态" prop="publishStatus">
+          <template slot-scope="{ row }">
+            <dict-tag :value="row.publishStatus" prop-name="pms_publish_status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+            >修改
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <InBody v-show="total>0">
+        <pagination
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </InBody>
+    </div>
+    <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>
 
-    <InBody v-show="total>0">
-      <pagination
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </InBody>
   </div>
 </template>
 
@@ -124,9 +128,11 @@
 import {delPmsProduct, listPmsProduct} from "@/api/pms/product";
 import {isStarRepo} from "@/utils/is-star-plugin";
 import {mapGetters} from "vuex";
+import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
 
 export default {
   name: "PmsProduct",
+  components: {SeeAdsComponent},
   dicts: ['pms_publish_status'],
   data() {
     return {
@@ -169,17 +175,24 @@ export default {
       },
     };
   },
-  async created() {
-    const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/pms/product', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
-    this.show = res;
-    if (res) {
-      this.getList();
-    }
+  created() {
+    this.$nextTick(()=>{
+      this.$refs.seeAdsComponentRef.show()
+    })
   },
   computed:{
     ...mapGetters(['userId']),
   },
   methods: {
+    async confirmOk(success) {
+      if (success) {
+        const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/pms/product', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
+        this.show = res;
+        if (res) {
+          this.getList();
+        }
+      }
+    },
     /** 查询商品信息列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index cd21c48..5734c1f 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -1,114 +1,115 @@
 <template>
-  <div class="app-container" v-if="show">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
-      <el-form-item label="创建时间">
-        <el-date-picker
-          size="small"
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          :clearable="true"
-          :picker-options='pickerOptions'
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-<!--      <el-form-item label="账号启用状态">-->
-<!--        <el-select v-model="queryParams.status" placeholder="请选择" :clearable="true" size="small">-->
-<!--          <el-option label="禁用" value="0">-->
-<!--          </el-option>-->
-<!--          <el-option label="启用" value="1">-->
-<!--          </el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-      <el-form-item label="昵称" prop="nickname">
-        <el-input
-          v-model.trim="queryParams.nickname"
-          placeholder="请输入昵称"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="手机号码" prop="phone">
-        <el-input
-          v-model.trim="queryParams.phone"
-          placeholder="请输入手机号码"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="mark">
-        <el-select v-model="queryParams.hasMark" clearable size="small">
-          <el-option value="1" label="有备注" />
-          <el-option value="0" label="无备注"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
-      </el-form-item>
-    </el-form>
+  <div class="app-container">
+    <div v-show="show">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+        <el-form-item label="创建时间">
+          <el-date-picker
+            size="small"
+            v-model="dateRange"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            :clearable="true"
+            :picker-options='pickerOptions'
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+  <!--      <el-form-item label="账号启用状态">-->
+  <!--        <el-select v-model="queryParams.status" placeholder="请选择" :clearable="true" size="small">-->
+  <!--          <el-option label="禁用" value="0">-->
+  <!--          </el-option>-->
+  <!--          <el-option label="启用" value="1">-->
+  <!--          </el-option>-->
+  <!--        </el-select>-->
+  <!--      </el-form-item>-->
+        <el-form-item label="昵称" prop="nickname">
+          <el-input
+            v-model.trim="queryParams.nickname"
+            placeholder="请输入昵称"
+            clearable
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input
+            v-model.trim="queryParams.phone"
+            placeholder="请输入手机号码"
+            clearable
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="mark">
+          <el-select v-model="queryParams.hasMark" clearable size="small">
+            <el-option value="1" label="有备注" />
+            <el-option value="0" label="无备注"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
+        </el-form-item>
+      </el-form>
 
-    <el-table v-loading="loading" :data="umsMemberList" border>
-      <el-table-column label="昵称" prop="nickname" width="150"/>
-      <el-table-column label="手机号码" prop="phoneHidden" width="150"/>
-      <el-table-column label="佣金" width="120">
-        <template v-slot="scope">
-          <div>0.00</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="积分" width="120">
-        <template v-slot="scope">
-          <div>0.00</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="余额" width="120">
-        <template v-slot="scope">
-          <div>0.00</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="注册时间" prop="createTime" width="180">
-        <template v-slot="scope">
-          <div>{{ parseTime(scope.row.createTime) }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="上次登录" prop="createTime">
-        <template v-slot="scope">
-          <div>{{ parseTime(scope.row.createTime) }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注">
-        <template v-slot="scope">
-          <span class="mr10">{{scope.row.mark}}</span>
-          <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width" fix="right" width="200">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="showStatistics(scope.row.id)"
-            v-hasPermi="['ums:member:statistics']"
-          >查看数据
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="goOrder(scope.row.phoneEncrypted)"
-          >查看下单</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="goCart(scope.row.phoneEncrypted)"
-          >查看购物车</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <InBody v-show="total>0">
+      <el-table v-loading="loading" :data="umsMemberList" border>
+        <el-table-column label="昵称" prop="nickname" width="150"/>
+        <el-table-column label="手机号码" prop="phoneHidden" width="150"/>
+        <el-table-column label="佣金" width="120">
+          <template v-slot="scope">
+            <div>0.00</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="积分" width="120">
+          <template v-slot="scope">
+            <div>0.00</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="余额" width="120">
+          <template v-slot="scope">
+            <div>0.00</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="注册时间" prop="createTime" width="180">
+          <template v-slot="scope">
+            <div>{{ parseTime(scope.row.createTime) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="上次登录" prop="createTime">
+          <template v-slot="scope">
+            <div>{{ parseTime(scope.row.createTime) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注">
+          <template v-slot="scope">
+            <span class="mr10">{{scope.row.mark}}</span>
+            <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" class-name="small-padding fixed-width" fix="right" width="200">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="showStatistics(scope.row.id)"
+              v-hasPermi="['ums:member:statistics']"
+            >查看数据
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="goOrder(scope.row.phoneEncrypted)"
+            >查看下单</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="goCart(scope.row.phoneEncrypted)"
+            >查看购物车</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <InBody v-show="total>0">
       <pagination
         :total="total"
         :page.sync="queryParams.pageNum"
@@ -116,6 +117,8 @@
         @pagination="getList"
       />
     </InBody>
+    </div>
+    <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>
     <!--  统计  -->
     <el-dialog :title="statisticsObj.title" :visible.sync="statisticsObj.open" width="500px" append-to-body>
       <el-descriptions direction="vertical" :column="2" border>
@@ -151,9 +154,11 @@ import {
 import dateUtil from '@/utils/DateUtil';
 import {isStarRepo} from "@/utils/is-star-plugin";
 import {mapGetters} from "vuex";
+import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
 
 export default {
   name: "UmsMember",
+  components: {SeeAdsComponent},
   data() {
     return {
       show: false,
@@ -220,16 +225,23 @@ export default {
     };
   },
   async created() {
-    const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/member/member', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
-    this.show = res;
-    if (res) {
-      this.getList();
-    }
+    this.$nextTick(()=>{
+      this.$refs.seeAdsComponentRef.show()
+    })
   },
   computed:{
     ...mapGetters(['userId']),
   },
   methods: {
+    async confirmOk(success) {
+      if (success) {
+        const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/member/member', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
+        this.show = res;
+        if (res) {
+          this.getList();
+        }
+      }
+    },
     showUpdateMark(record){
       this.remarkModal = {
         visible: true,