Pārlūkot izejas kodu

fix:采购单位画像记录

yangfeng 3 gadi atpakaļ
vecāks
revīzija
dd02d685d4

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -156,7 +156,7 @@
               </div>
               <div class="static-scope">数据统计范围:${statistics.start || '-'}-${statistics.end}</div>
             </div>
-            <div class="jy-empty" v-show="allNot">
+            <div class="jy-empty" v-show="allNot && !getStatus">
                 <div class="jy-empty-img"></div>
                 <p class="jy-empty-text">对不起,没有匹配到相关信息, <br>修改时间范围或换个搜索词试试吧</p>
             </div>

+ 8 - 1
src/web/staticres/css/dev2/newBidSearch.css

@@ -496,6 +496,7 @@
 }
 .file-count-tip .file-count{
   color: #2CB7CA;
+  font-style: normal;
 }
 .file-icon-help{
   margin-left: 8px;
@@ -536,9 +537,15 @@
   border: 0;
   box-sizing: border-box;
 }
-.custom-cancel-btn{
+.custom-cancel-btn,
+.custom-cancel-btn:hover,
+.custom-cancel-btn:focus{
   width: 132px;
   height: 34px;
+  background-color: #fff;
+  border: 1px solid #DCDFE6;
+  color: #686868;
+  font-style: 16px;
 }
 .custom-alert .el-message-box__btns button:nth-child(2){
   margin-left: 32px;

+ 43 - 0
src/web/staticres/frontRouter/pc/seeBuyerHistory/css/index-pc.css

@@ -211,4 +211,47 @@
     color: #FFFFFF;
     margin-top: 32px;
     cursor: pointer;
+}
+.custom-dialog{
+  border-radius: 8px;
+}
+.custom-dialog .el-button--primary,
+.custom-dialog .el-button--primary:hover,
+.custom-dialog .el-button--primary:focus{
+  width: 132px;
+  height: 36px;
+  text-align: center;
+  background: #2CB7CA;
+  border-radius: 6px;
+  font-style: 16px;
+  color: #fff;
+  border: 0;
+}
+.custom-dialog .el-dialog__header{
+  padding: 0;
+}
+.custom-dialog .el-dialog__body{
+  padding: 32px;
+  color: #686868;
+  font-size: 14px;
+  line-height: 22px;
+  text-align: justify;
+}
+.custom-dialog .el-dialog__body i{
+  color: #2CB7CA;
+}
+.custom-dialog .el-button--default,
+.custom-dialog .el-button--default:hover,
+.custom-dialog .el-button--default:focus{
+  width: 132px;
+  height: 36px;
+  text-align: center;
+  background: #fff;
+  border-radius: 6px;
+  font-style: 16px;
+  color: #686868;
+  border: 1px solid #DCDFE6;
+}
+.custom-dialog .el-dialog__footer{
+  padding-bottom: 32px;
 }

+ 140 - 118
src/web/staticres/frontRouter/pc/seeBuyerHistory/js/index-pc.js

@@ -1,131 +1,153 @@
 function getShortName (comName) {
-    var areaMap = chinaMapJSON || []
-    var shortname = comName
-    // 1. 循环省份城市进行替换
-    areaMap.forEach(function (item) {
-        var p = item.name.replace(/[省市]/, '')
-        if (shortname.indexOf(p) !== -1) {
-        shortname = shortname.replace(item.name, '').replace(p, '')
-        console.log(p + ' -> \'\'')
-        }
-        item.city.forEach(function (iitem) {
-        var c = iitem.name.replace(/[省市]/, '')
-        if (shortname.indexOf(c) !== -1) {
-            shortname = shortname.replace(iitem.name, '').replace(c, '')
-            console.log(c + ' -> \'\'')
+  var areaMap = chinaMapJSON || []
+  var shortname = comName
+  // 1. 循环省份城市进行替换
+  areaMap.forEach(function (item) {
+    var p = item.name.replace(/[省市]/, '')
+    if (shortname.indexOf(p) !== -1) {
+      shortname = shortname.replace(item.name, '').replace(p, '')
+      console.log(p + ' -> \'\'')
+    }
+    item.city.forEach(function (iitem) {
+      var c = iitem.name.replace(/[省市]/, '')
+      if (shortname.indexOf(c) !== -1) {
+        shortname = shortname.replace(iitem.name, '').replace(c, '')
+        console.log(c + ' -> \'\'')
+      }
+      iitem.area.forEach(function (iiitem) {
+        if (shortname.indexOf(iiitem) !== -1) {
+          shortname = shortname.replace(iiitem, '')
+          console.log(iiitem + ' -> \'\'')
         }
-        iitem.area.forEach(function (iiitem) {
-            if (shortname.indexOf(iiitem) !== -1) {
-            shortname = shortname.replace(iiitem, '')
-            console.log(iiitem + ' -> \'\'')
-            }
-        })
-        })
+      })
     })
-    var matchRes = shortname.match(/[\u4e00-\u9fa5]{4}/gm)
-    var shortname = matchRes ? matchRes[0] : shortname.slice(0, 4)
-    if (shortname.length < 4) {
-        shortname = shortname.slice(0, 4)
-    }
-    return shortname
+  })
+  var matchRes = shortname.match(/[\u4e00-\u9fa5]{4}/gm)
+  var shortname = matchRes ? matchRes[0] : shortname.slice(0, 4)
+  if (shortname.length < 4) {
+    shortname = shortname.slice(0, 4)
+  }
+  return shortname
 }
 var vm = new Vue({
-    el: '.see-container',
-    delimiters: ['{', '}'],
-    data () {
-        return {
-            working: false,
-            empty: false,
-            dateVal: '',
-            years: '',
-            months: '',
-            points: [],
-            statusEnum: ['存续', '吊销', '注销', '撤销'],
-            statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
-            seeList: {
-                pageNum: 1, // 当前页
-                pageSize: 10, // 每页多少条数据
-                total: 0, // 总页数
-                list: [] // 返回的数据
-            }
+  el: '.see-container',
+  delimiters: ['{', '}'],
+  data () {
+    return {
+      working: false,
+      empty: false,
+      dateVal: '',
+      years: '',
+      months: '',
+      points: {},
+      statusEnum: ['存续', '吊销', '注销', '撤销'],
+      statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
+      seeList: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 每页多少条数据
+        total: 0, // 总页数
+        list: [] // 返回的数据
+      },
+      tipDialog: false
+    }
+  },
+  computed: {
+    dialogBtnText: function() {
+      if (this.points.provin == -1) {
+        return '联系客服'
+      } else {
+        return '前往升级'
+      }
+    }
+  },
+  created () {
+    this.years = new Date().getFullYear()
+    this.months = parseInt(new Date().getMonth() + 1)
+    this.dateVal = new Date()
+    this.subPoint()
+    this.subRecord()
+  },
+  methods: {
+    showTip () {
+      this.tipDialog = true
+    },
+    goHandle (item) {
+      if (item == '前往升级') {
+        window.open('/swordfish/page_big_pc/free/svip/buy?type=upgrade')
+        this.tipDialog = false
+      } else {
+        $('.open-customer').unbind('click').trigger('click')
+        this.tipDialog = false
+      }
+    },
+    subPoint () {
+      $.ajax({
+        url: '/bigmember/portrait/subVipPortrait/usage?p_type=1',
+        type: 'POST',
+        contentType: 'application/x-www-form-urlencoded',
+        data: '',
+        dataType: 'json'
+      }).done(res => {
+        if (res.error_code == 0) {
+          this.points = res.data
         }
+      })
     },
-    created() {
-        this.years = new Date().getFullYear()
-        this.months = parseInt(new Date().getMonth() + 1)
-        this.dateVal = new Date()
-        this.subPoint()
-        this.subRecord()
+    getDatas () {
+      return {
+        year: this.years,
+        month: this.months,
+        pageSize: this.seeList.pageSize,
+        pageNum: this.seeList.pageNum - 1,
+        p_type: 1
+      }
     },
-    methods: {
-        subPoint() {
-            $.ajax({
-              url: '/bigmember/portrait/subVipPortrait/usage?p_type=1',
-              type: 'POST',
-              contentType: 'application/x-www-form-urlencoded',
-              data: '',
-              dataType: 'json'
-            }).done(res => {
-              if (res.error_code == 0) {
-                this.points = res.data
-              }
-            })
-        },
-        getDatas() {
+    subRecord () {
+      this.working = true
+      this.empty = false
+      $.ajax({
+        url: '/bigmember/portrait/subVipPortrait/record',
+        type: 'POST',
+        contentType: 'application/x-www-form-urlencoded',
+        data: this.getDatas(),
+        dataType: 'json'
+      }).done(res => {
+        var _this = this
+        if (res.error_code === 0) {
+          this.working = false
+          this.empty = true
+          if (res.data.total) {
+            this.seeList.total = res.data.total
+          }
+          if (!res.data.list) {
+            res.data.list = []
+          }
+          this.seeList.list = this.seeList.list.concat(res.data.list.map(function (v) {
             return {
-                year: this.years,
-                month: this.months,
-                pageSize: this.seeList.pageSize,
-                pageNum: this.seeList.pageNum - 1,
-                p_type:1
+              name: v.name,
+              province: v.province,
+              city: v.city,
+              buyerclass: v.buyerclass,
+              checked: false
             }
-        },
-        subRecord() {
-            this.working = true
-            this.empty = false
-            $.ajax({
-                url: '/bigmember/portrait/subVipPortrait/record',
-                type: 'POST',
-                contentType: 'application/x-www-form-urlencoded',
-                data: this.getDatas(),
-                dataType: 'json'
-            }).done(res => {
-                var _this = this
-                if (res.error_code === 0) {
-                    this.working = false
-                    this.empty = true
-                    if (res.data.total) {
-                        this.seeList.total = res.data.total
-                    }
-                    if (!res.data.list){
-                        res.data.list=[]
-                    }
-                    this.seeList.list = this.seeList.list.concat(res.data.list.map(function (v) {
-                        return {
-                            name: v.name,
-                            province: v.province,
-                            city: v.city,
-                            buyerclass: v.buyerclass,
-                            checked: false
-                        }
-                    }))
-                }
-            })
-        },
-        onPageChange(page) {
-            this.seeList.pageNum = page
-            this.seeList.list = []
-            this.subRecord()
-        },
-        dateHandler(val) {
-            this.years = val.getFullYear()
-            this.months = val.getMonth() + 1
-            this.seeList.pageNum = 1
-            this.seeList.list = []
-            this.subRecord()
-        },
-        detailed(ids) {
-            window.open('/swordfish/page_big_pc/unit_portrayal/' + ids, '_blank')
+          }))
         }
+      })
+    },
+    onPageChange (page) {
+      this.seeList.pageNum = page
+      this.seeList.list = []
+      this.subRecord()
+    },
+    dateHandler (val) {
+      this.years = val.getFullYear()
+      this.months = val.getMonth() + 1
+      this.seeList.pageNum = 1
+      this.seeList.list = []
+      this.subRecord()
+    },
+    detailed (ids) {
+      window.open('/swordfish/page_big_pc/unit_portrayal/' + ids, '_blank')
     }
+  }
 })

+ 1 - 1
src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -170,7 +170,7 @@
               </div>
               <div class="static-scope">数据统计范围:${statistics.start || '-'}-${statistics.end}</div>
           </div>
-          <div class="jy-empty" v-show="allNot">
+          <div class="jy-empty" v-show="allNot && !getStatus">
             <div class="jy-empty-img"></div>
             <p class="jy-empty-text">对不起,没有匹配到相关信息, <br>修改时间范围或换个搜索词试试吧</p>
           </div>

+ 112 - 104
src/web/templates/frontRouter/pc/seeBuyerHistory/sess/index.html

@@ -1,117 +1,125 @@
-
 <html lang="zh-cn">
-	<head>
-		<title>历史查看记录_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
-		<meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}"/>
-		<meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}"/>
-		<meta name="renderer" content="webkit">
-		<meta content="telephone=no" name="format-detection"/>
-        <meta content="历史查看记录" theme="light" name="enable-header"/>
-		{{include "/common/pnc.html"}}
-		<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
-		<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
-		<link href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
 
-        <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
+<head>
+  <title>历史查看记录_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
+  <meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}" />
+  <meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}" />
+  <meta name="renderer" content="webkit">
+  <meta content="telephone=no" name="format-detection" />
+  <meta content="历史查看记录" theme="light" name="enable-header" />
+  {{include "/common/pnc.html"}}
+  <link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
+  <link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
+  <link href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
 
-        <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/selector/selector.css?v={{Msg "seo" "version"}}'>
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/css/index-pc.css?v={{Msg "seo" "version"}}'>
-	</head>
+  <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
+  <script src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
 
-	<body>
-	{{include "/common/pchead.html"}}
-    <div class="dialog" style="display: none" onclick="closeDialog()">
-        <div class="alertDiv">
-            <div class="content">
-                每购买1个省,每月可查看<i>5个</i>采购单位画像,<i>上限<br>为80个</i>,每月1号上月余额清零重新计算。
-            </div>
-            <div class="iKnowBtn">我知道了</div>
+  <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/selector/selector.css?v={{Msg "seo" "version"}}'>
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/css/index-pc.css?v={{Msg "seo" "version"}}'>
+</head>
+
+<body>
+  {{include "/common/pchead.html"}}
+
+  <section class="see-container" v-cloak>
+    <div class="see-header flex w">
+      <div class="l-tabs flex">
+        <h3 class="tab-title">采购单位画像记录</h3>
+        <div class="tips">
+          当月已使用:<span>{points.usage?points.usage:0}</span>/{points.total?points.total:0}
         </div>
+        <div class="tip" style="cursor: pointer;" @click="showTip"></div>
+      </div>
+      <div class="l-tabs r-tabs">
+        <span class="r-word">选择月份</span>
+        <el-date-picker class="date-class" v-model="dateVal" type="month" format="yyyy年MM月" @change="dateHandler"
+          placeholder="请选择月份" :clearable="false" :editable="false">
+        </el-date-picker>
+        <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
+      </div>
     </div>
-	<section class="see-container" v-cloak >
-        <div class="see-header flex w">
-            <div class="l-tabs flex">
-                <h3 class="tab-title">采购单位画像记录</h3>
-                <div class="tips">
-                    当月已使用:<span>{points.usage?points.usage:0}</span>/{points.total?points.total:0}
-                </div>
-                <div class="tip" @click="showTip"></div>
-            </div>
-            <div class="l-tabs r-tabs">
-                <span class="r-word">选择月份</span>
-                <el-date-picker
-                    class="date-class"
-                    v-model="dateVal"
-                    type="month"
-                    format="yyyy年MM月"
-                    @change="dateHandler"
-                    placeholder="请选择月份"
-                    :clearable="false"
-                    :editable="false">
-                </el-date-picker>
-                <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
-            </div>
-        </div>
-        <div class="see-content w" v-show="seeList.list.length !== 0 && empty">
-            <div class="lists flex" v-for="item in seeList.list" :key="item._id">
-                <div class="r-conts flex">
-                    <h3 class="flex" @click="detailed(item.name)">{item.name}<span v-show="item.status >= 0" :class="'status-' + item.status">{item.statusWord}</span></h3>
-                    <div class="line">
-                        <div class="cont-tips address"><i class="addr">所在地:</i>
-                            <span v-if="item.province">{item.province}</span>
-                            <span v-if="item.city">{item.city}</span>
-                            <span v-if="!(item.province && item.city)">--</span>
-                        </div>
-                        <div class="cont-tips buyerclass"><i class="buyer">采购单位类型:</i><span>{item.buyerclass || '--'}</span></div>
-                    </div>
-                </div>
-            </div>
-            <div class="el-pagination-container" v-show="seeList.total">
-                <el-pagination
-                    background
-                    layout="prev, pager, next, ->"
-                    :hide-on-single-page="true"
-                    :current-page="seeList.pageNum"
-                    :page-size="seeList.pageSize"
-                    :total="seeList.total"
-                    @current-change="onPageChange"
-                ></el-pagination>
+    <div class="see-content w" v-show="seeList.list.length !== 0 && empty">
+      <div class="lists flex" v-for="item in seeList.list" :key="item._id">
+        <div class="r-conts flex">
+          <h3 class="flex" @click="detailed(item.name)">{item.name}<span v-show="item.status >= 0"
+              :class="'status-' + item.status">{item.statusWord}</span></h3>
+          <div class="line">
+            <div class="cont-tips address"><i class="addr">所在地:</i>
+              <span v-if="item.province">{item.province}</span>
+              <span v-if="item.city">{item.city}</span>
+              <span v-if="!(item.province && item.city)">--</span>
             </div>
+            <div class="cont-tips buyerclass"><i class="buyer">采购单位类型:</i><span>{item.buyerclass || '--'}</span></div>
+          </div>
         </div>
-        <div class="no-data" v-if="working"><el-image src="/images/working.gif"></el-image><div class="tip-text"><p>剑鱼标讯正在努力工作中...</p></div></div>
-        <div class="no-data" v-if="seeList.list == 0 && empty"><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无数据</p></div></div>
-    </section>
+      </div>
+      <div class="el-pagination-container" v-show="seeList.total">
+        <el-pagination background layout="prev, pager, next, ->" :hide-on-single-page="true"
+          :current-page="seeList.pageNum" :page-size="seeList.pageSize" :total="seeList.total"
+          @current-change="onPageChange"></el-pagination>
+      </div>
+    </div>
+    <div class="no-data" v-if="working">
+      <el-image src="/images/working.gif"></el-image>
+      <div class="tip-text">
+        <p>剑鱼标讯正在努力工作中...</p>
+      </div>
+    </div>
+    <div class="no-data" v-if="seeList.list == 0 && empty">
+      <el-image src="/images/pc_12.png"></el-image>
+      <div class="tip-text">
+        <p>暂无数据</p>
+      </div>
+    </div>
+    <el-dialog
+      :visible.sync="tipDialog"
+      :show-close="false"
+      custom-class="custom-dialog"
+      width="380"
+      center>
+      <div>
+        每购买1个省,每月可查看<i>5个</i>采购单位画像,<i>上限为80个</i>,您当前订阅了
+        <span v-if="points.provin == -1">全国,查看机会已经消耗完毕,如需要更多服务,请前往联系客服。</span>
+        <span v-else>{points.provin}个省,如需查看更多,前往订阅更多省份。</span>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="tipDialog = false">取 消</el-button>
+        <el-button type="primary" @click.stop="goHandle(dialogBtnText)">{dialogBtnText}</el-button>
+      </div>
+    </el-dialog>
+  </section>
 
-    {{include "/common/pcbottom.html"}}
-    {{include "/common/baiducc.html"}}
+  {{include "/common/pcbottom.html"}}
+  {{include "/common/baiducc.html"}}
 
-    <script>
-        haslogin({{.T.logid}})
-        function baiduEvent(name) {
-          try {
-            console.log(name, 'name')
-            _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
-          } catch (e) {
-            console.log('未初始化百度统计')
-          }
-        }
-    </script>
-    <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
-    <script>
-        function closeDialog(){
-            $(".dialog").css("display","none")
-        }
-        function showTip(){
-            $(".dialog").css("display","unset")
-        }
-    </script>
+  <script>
+    haslogin({{.T.logid}})
+
+    function baiduEvent(name) {
+      try {
+        console.log(name, 'name')
+        _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
+      } catch (e) {
+        console.log('未初始化百度统计')
+      }
+    }
+  </script>
+  <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+  <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
+  <script>
+    function closeDialog() {
+      $(".dialog").css("display", "none")
+    }
+
+    function showTip() {
+      $(".dialog").css("display", "unset")
+    }
+  </script>
+  <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
 </body>
 
 </html>
-

+ 10 - 7
src/web/templates/pc/biddetail_rec.html

@@ -864,7 +864,7 @@
           <span style="font-weight: 400;font-size: 16px">附件下载</span>
           <span class="free-download">免费下载1次</span>
           <span class="super-vip-show" style="display:none;">
-            <span class="file-count-tip">本月剩余:<em class="file-count"></em>次</span>
+            <span class="file-count-tip">本月剩余:<i class="file-count"></i> 次</span>
             <img class="file-icon-help" src="/images/help-b.png" alt="">
             <span class="concat-kf open-customer">联系客服</span>
           </span>
@@ -3339,15 +3339,18 @@ function fromwhere(text){
             bidVue.$confirm('您本月查看机会已经消耗完毕,如需要更多服务,请前往联系客服。', {
               showClose:false,
               center: true,
-              confirmButtonText: '联系客服',
+              confirmButtonText: '取消',
               customClass: 'custom-alert',
               showCancelButton: true,
-              confirmButtonClass: 'custom-confirm-btn',
-              cancelButtonClass: 'custom-cancel-btn'
+              confirmButtonClass: 'custom-cancel-btn',
+              cancelButtonClass: 'custom-confirm-btn',
+              cancelButtonText: '联系客服'
             }).then(function(data){
+              
+            }).catch(function(){
               $('.open-customer').trigger('click')
               $('body').trigger('click')
-            }).catch(function(){});
+            });
           }
         } else {
           // 老超级订阅用户 提醒升级
@@ -3373,7 +3376,7 @@ function fromwhere(text){
           confirmButtonText: '我知道了',
           customClass: 'custom-alert',
           showCancelButton: true,
-          confirmButtonClass: 'custom-alert-btn'
+          confirmButtonClass: 'custom-confirm-btn'
         });
         return
       }
@@ -3468,7 +3471,7 @@ function fromwhere(text){
         center: true,
         confirmButtonText: '我知道了',
         customClass: 'custom-alert',
-        confirmButtonClass: 'custom-alert-btn'
+        confirmButtonClass: 'custom-confirm-btn'
       });
     })
     // 免费下载一次点击