Răsfoiți Sursa

Merge branch 'dev1.8.7' into master

lianbingjie 4 ani în urmă
părinte
comite
cd94f5da0a

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
qmx_page/css/app.62553a10.css


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
qmx_page/css/app.d6d79839.css


+ 1 - 1
qmx_page/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.d6d79839.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.4de2b756.js rel=preload as=script><link href=/js/chunk-vendors.c098ed88.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.d6d79839.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.c098ed88.js></script><script src=/js/app.4de2b756.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.62553a10.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.4098fd74.js rel=preload as=script><link href=/js/chunk-vendors.c098ed88.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.62553a10.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.c098ed88.js></script><script src=/js/app.4098fd74.js></script></body></html>

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
qmx_page/js/app.4098fd74.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
qmx_page/js/app.4de2b756.js


+ 5 - 0
src/router.js

@@ -41,6 +41,11 @@ const routes = [
         path: '/userMage/userList/userDetail',
         name: 'userDetail',
         component: () => import('./views/userManage/userDetail.vue')
+    },
+    {
+        path: '/boardMsg/inforList/inforDetail',
+        name: 'inforDetail',
+        component: () => import('./views/boardMsg/inforDetail.vue')
     }
 ];
 

+ 152 - 0
src/views/boardMsg/inforDetail.vue

@@ -0,0 +1,152 @@
+<template>
+  <div class="info-detail">
+    <h1>公众号模板消息</h1>
+    <div class="info-conts">
+      <div class="top-word">
+        <div class="l-menu">
+          <p><span>模板ID</span><i>{{conts.templateId?conts.templateId:'-'}}</i></p>
+          <p><span>标题</span><i>{{conts.title?conts.title:'-'}}</i></p>
+          <p><span>行业</span><i>{{conts.deputyIndustry?conts.deputyIndustry:'-'}}</i></p>
+          <p><span>详细内容</span><i>{{conts.content?conts.content:'-'}}</i></p>
+        </div>
+      </div>
+      <div class="bot-word">
+        <Card v-for="(item, index) in scened" :key="item.id" style="margin-bottom: 20px">
+          <h3>场景{{index + 1}}. {{item.sceneName}}</h3>
+          <div class="scene-list">
+            <div class="l-scene r-w-cont">
+              <p><span class="spa">推送逻辑:</span><i>{{item.pushLogic?item.pushLogic:'-'}}</i></p>
+              <p><span class="spa">推送用户:</span><i>{{item.pushUser?item.pushUser:'-'}}</i></p>
+              <p><span class="spa">模板对应firstdata字段:</span>
+                <i>{{item.firstdata?item.firstdata:'-'}}</i>
+                <Button size="small" @click="edits(item.id, item.firstdata)">修改</Button>
+                <Button size="small" type="primary" @click="save(item.id, 1)" style="margin: 0 20px" :disabled="item.isTest == 1">{{item.isTest == 1 ? '已测试' : '测试'}}</Button>
+                <Button size="small" type="primary" @click="save(item.id, 2)" :disabled="item.state == 1">{{item.state == 1 ? '已生效' : '确认生效'}}</Button>
+              </p>
+            </div>
+          </div>
+        </Card>
+      </div>
+      <Modal v-model="info.show" title="修改" :width="500" :mask-closable="false">
+            <Input v-model.trim="info.descri" :rows="5" type="textarea"></Input>
+            <div slot="footer">
+                <Button type="primary" size="large" @click="save(0, 0)">提交</Button>
+            </div>
+        </Modal>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      conts: [],
+      scened: [],
+      info: {
+        show: false,
+        id: 0,
+        descri: ''
+      }
+    }
+  },
+  created() {
+    this.detailed()
+  },
+  methods: {
+    detailed () {
+      this.$request('/template/templateInfo').data({id: this.$route.query.id}).success(r => {
+        this.conts = r.data.template
+        this.scened = r.data.scene
+      }).post()
+    },
+    edits(ids, item) {
+      this.info.show = true
+      this.info.id = ids
+      this.info.descri = item
+    },
+    save (ids, num) {
+      this.$request('/template/updateScene').data({
+        id: num == 0 ? this.info.id : ids,
+        firstdata: this.info.descri,
+        model: num
+      }).success(() => {
+        this.info.show = false
+        this.info.descri = ''
+        this.detailed()
+      }).post()
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.info-detail {
+  h1 {
+      font-size:24px;
+      color:#3f4047;
+      padding: 10px 0 20px 10px;
+  }
+  .info-conts {
+    min-height: calc(100vh - 210px);
+    background: #fff;
+    padding: 16px;
+    .top-word {
+      display: flex;
+      flex-direction: inherit;
+      width: 600px;
+      margin: 0 auto;
+      margin-bottom: 30px;
+      .l-menu {
+        min-width: 120px;
+        p {
+          display: flex;
+          line-height: 46px;
+          font-size: 15px;
+          span {
+            min-width: 80px;
+          }
+          i {
+            display: inline-block;
+            line-height: 24px;
+            margin-top: 10px;
+          }
+        }
+      }
+    }
+    .bot-word {
+      /deep/ .ivu-card {
+        background: #f5f7f9;
+        .scene-list {
+          display: flex;
+          flex-direction: inherit;
+          margin-top: 10px;
+          .l-scene {
+            p {
+              display: flex;
+              line-height: 26px;
+              font-size: 15px;
+              .spa {
+                width: 160px;
+                text-align: right;
+              }
+              i {
+                display: inline-block;
+                line-height: 26px;
+                margin-right: 30px;
+              }
+            }
+          }
+          .r-w-cont {
+            p {
+              i {
+                max-width: 660px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

+ 98 - 0
src/views/boardMsg/inforList.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="info-list">
+    <h1>公众号模板消息</h1>
+    <table-lists 
+        ref="tableLists" 
+        v-model="list" 
+        :filter="filter" 
+        :sear="sear"
+        :filterType="2" 
+        :filterReset="0" 
+        :filterSear="2" 
+        requestApi="/template/templateList" 
+        style="background:#fff;padding:10px"
+        @loading="load"
+    >
+      <template slot="filterRight">
+          <Input suffix="md-search" type="text" v-model="sear.search" placeholder="搜索模板名称" clearable class="ser-ipt"/>
+      </template>
+      <Table 
+        ellipsis 
+        :loading="loading" 
+        ref="selection" 
+        :columns="columns" 
+        :data="list.lists" 
+        stripe
+      >
+        <template slot-scope="{ row }" slot="op">
+            <router-link 
+                :to="{path:'/boardMsg/inforList/inforDetail', query: {id: row.id}}"
+                target="_blank"
+                style="color: #2d8cf0"
+            >查看详情</router-link>
+        </template>
+      </Table>
+      <template slot="options">
+        <div style="color:#d7d7d7;font-size:14px">共计{{list.total ? list.total : '0'}}条结算记录</div>
+      </template>
+    </table-lists>
+  </div>
+</template>
+<script>
+export default {
+    methods: {
+        load (val) {
+            this.loading = val
+        }
+    },
+    data () {
+        return {
+            loading: false,
+            filter: {
+                
+            },
+            sear: {
+                search: ''
+            },
+            columns: [
+                {
+                    title: '模板名称',
+                    key: 'title',
+                    align: 'center',
+                    render: (h, {row}) => {
+                        return h('span', row.title == '' || row.title == null ? '-' : row.title)
+                    }
+                },
+                {
+                    title: '模板ID',
+                    key: 'templateId',
+                    width: '400px',
+                    align: 'center',
+                    render: (h, {row}) => {
+                        return h('span', row.templateId == '' || row.templateId == null ? '-' : row.templateId)
+                    }
+                },
+                {
+                    title: '操作',
+                    slot: 'op',
+                    align: 'center'
+                }
+            ],
+            list: []
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.info-list {
+    h1 {
+        font-size:24px;
+        color:#3f4047;
+        padding: 10px 0 20px 10px;
+    }
+    .ser-ipt {
+        width: 162px;
+    }
+}
+</style>

+ 1 - 1
src/views/sales/partnerDetail.vue

@@ -130,7 +130,7 @@
             </Col>
         </Row>
         <Modal v-model="preview" footer-hide :styles="{top:0}" :width="800" class-name="par-model">
-            <img :src="parDetail.license">
+            <img width="100%" :src="parDetail.license">
         </Modal>
     </div>
 </template>

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff