Merge branch 'securityFund' into test

src/api/securityFund.js

+import request from '@/utils/request'
+
+// 获取店铺信息
+export const shopInfo = () => {
+  return request({
+    url: '/local/getShopInfo',
+    method: 'get'
+  })
+}
+
+// 获取交易流水
+export const bondDetail = (params) => {
+  return request({
+    url: '/local/shop/bond/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 充值保证金
+export const addBond = (data) => {
+  return request({
+    url: '/system/addBond',
+    method: 'post',
+    data
+  })
+}
+
+// 保证金额度说明
+export const bondByCate = (params) => {
+  return request({
+    url: '/local/getBondByCate',
+    method: 'get',
+    params
+  })
+}
+
+// 账户/列表
+export const accountList = (data) => {
+  return request({
+    url: '/system/bank/account/list',
+    method: 'post',
+    data
+  })
+}
+
+// 申请退保
+export const bondApply = (data) => {
+  return request({
+    url: '/local/bondApply',
+    method: 'post',
+    data
+  })
+}
+
+// 获取支付账户
+export const payDetails = (params) => {
+  return request({
+    url: '/system/payDetails',
+    method: 'get',
+    params
+  })
+}
+
+// 保证金申请详情
+export const applyDetail = (params) => {
+  return request({
+    url: '/local/bond/apply/detail',
+    method: 'get',
+    params
+  })
+}
+

src/router/index.js

@@ -77,6 +77,11 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
+  {
+    path: '/returnurl',
+    component: () => import('@/views/returnurl'),
+    hidden: true
+  },
   {
     path: '/',
     component: (resolve) => require(['@/views/entry/newyuncang'], resolve),

src/views/dashboard/PanelGroup.vue

 <template>
-  <el-row :gutter="40" class="panel-group">
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-        <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            总商品
+  <div>
+    <el-row :gutter="40" class="panel-group">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+          <div class="card-panel-icon-wrapper icon-people">
+            <svg-icon icon-class="peoples" class-name="card-panel-icon" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.goods_total" :duration="2600" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            总订单
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              总商品
+            </div>
+            <count-to :start-val="0" :end-val="panelData.goods_total" :duration="2600" class="card-panel-num" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.order_total" :duration="3000" class="card-panel-num" />
         </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            总收入
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('messages')">
+          <div class="card-panel-icon-wrapper icon-message">
+            <svg-icon icon-class="message" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              总订单
+            </div>
+            <count-to :start-val="0" :end-val="panelData.order_total" :duration="3000" class="card-panel-num" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.total_price" :decimals="2" :duration="3200" class="card-panel-num" />
         </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
-        <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('purchases')">
+          <div class="card-panel-icon-wrapper icon-money">
+            <svg-icon icon-class="money" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              总收入
+            </div>
+            <count-to :start-val="0" :end-val="panelData.total_price" :decimals="2" :duration="3200" class="card-panel-num" />
+          </div>
         </div>
-        <div class="xz-tip">{{(panelData.refund_total < 100)? panelData.refund_total : '99+' }}</div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            售后订单
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+          <div class="card-panel-icon-wrapper icon-shopping">
+            <svg-icon icon-class="shopping" class-name="card-panel-icon" />
           </div>
-          <count-to :start-val="0" :end-val="panelData.refund_total" :duration="3600" class="card-panel-num" />
+          <div class="xz-tip">{{(panelData.refund_total < 100)? panelData.refund_total : '99+' }}</div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              售后订单
+            </div>
+            <count-to :start-val="0" :end-val="panelData.refund_total" :duration="3600" class="card-panel-num" />
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 保证金充值提醒 -->
+    <el-dialog
+      style="margin-top: 200px;"
+      title="保证金充值提醒"
+      :visible.sync="dialogVisible"
+      :destroy-on-close="true"
+      width="35%"
+      center
+      :close-on-click-modal="false" 
+      append-to-body
+    >
+      <div>
+        <div style="background: rgba(58, 160, 255, .05); padding: 20px; line-height: 24px; text-align: center;">
+          <div>当前保证金余额不足，部分功能受限，请您及时充值保证金</div>
         </div>
       </div>
-    </el-col>
-  </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="goPay">去充值</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import CountTo from 'vue-count-to'
+import { shopInfo } from '@/api/securityFund';
 
 export default {
   data() {
-    return {}
+    return {
+      dialogVisible: false
+    }
   },
   props: {
     panelData: {
@@ -73,10 +98,30 @@ export default {
   },
   mounted() {
     // console.log(75,this.panelData);
+    this.getShopInfo()
   },
   methods: {
+    // 获取店铺信息
+    getShopInfo() {
+      shopInfo().then(res => {
+        if (res.code == 1) {
+          // 是否需要缴纳保证金 0否 1是
+          if (res.data.is_take_bond == 1 || res.data.bond < res.data.cate_bond / 2) {
+            this.dialogVisible = true
+          } else {
+            this.dialogVisible = false
+          }
+        }
+      })
+    },
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
+    },
+    goPay() {
+      this.dialogVisible = false
+      this.$router.push({
+        path: '/system/asset/securityFund'
+      })
     }
   }
 }

src/views/returnurl.vue

+<template>
+    
+</template>
+<script>
+export default {
+  name:'returnurl',
+  created(){
+  
+  },
+   mounted() {
+    window.opener = null
+    window.open('', self)
+    window.close()
+  },
+}
+</script>