liuyu 4 rokov pred
rodič
commit
fdc0d296ef

+ 1 - 0
src/main.js

@@ -12,6 +12,7 @@ import '@/plugins/loading';
 import '@/plugins/var';
 import '@/plugins/methods';
 import '@/plugins/setting';
+import '@/plugins/weixin';
 import '@/iconfont/iconfont.css';
 import InitStomp from '@/plugins/stomp';
 Vue.config.productionTip = false;

+ 1 - 1
src/plugins/setting.js

@@ -2,7 +2,7 @@ import Vue from 'vue';
 
 Vue.config.weixin = {
   // baseUrl: process.env.BASE_URL + 'weixin',
-  baseUrl: 'http://10.16.8.209:9005',
+  baseUrl: 'https://zb.liaoningdoupo.com',
 };
 
 Vue.config.stomp = {

+ 6 - 0
src/plugins/weixin.js

@@ -0,0 +1,6 @@
+import Vue from 'vue';
+const wx = require('weixin-js-sdk');
+wx.config({
+  appid: `wxd794d8f022ffd8c8`,
+});
+Vue.prototype.$wx = wx;

+ 2 - 0
src/store/index.js

@@ -23,6 +23,7 @@ import chat from './chat';
 import uploadquestion from './onlive/uploadquestion';
 import contact from './contact';
 import news from './news';
+import weixin from './weixin';
 import * as ustate from '@/store/common/state';
 import * as umutations from '@/store/common/mutations';
 
@@ -57,5 +58,6 @@ export default new Vuex.Store({
     uploadquestion,
     contact,
     news,
+    weixin,
   },
 });

+ 23 - 0
src/store/weixin.js

@@ -0,0 +1,23 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  support: `/api/onlive/wxpaysign`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async support({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.support}`, payload);
+    return res;
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

+ 7 - 7
src/views/index.vue

@@ -33,7 +33,7 @@
             </van-col>
             <van-col span="8" class="btn" @click.native="$router.push({ path: '/user/index', query: { type: '5' } })">
               <i class="iconfont iconjiaoyu icon" style="color:#3B9C55;"></i>
-              <p style="color:#3B9C55;">继续教育申请</p>
+              <p style="color:#3B9C55;">继续教育学分申请</p>
             </van-col>
             <van-col span="8" class="btn" @click.native="$router.push({ path: '/live/roomlist' })">
               <i class="iconfont iconzhibo icon" style="color:#645FB9;"></i>
@@ -44,11 +44,11 @@
               <p style="color:#00A8C4;">联系客服</p>
             </van-col>
             <van-col span="8" class="btn" @click.native="$router.push({ path: '/meetingBrief/index', query: { type: '6' } })">
-              <i class="iconfont iconwenxintishi icon" style="color:#5E2422;"></i>
+              <i class="iconfont iconwenxintishi icon" style="color:#E6A23C;"></i>
               <p style="color:#5E2422;">温馨提示</p>
             </van-col>
           </van-col>
-          <van-col span="24" class="after">
+          <!-- <van-col span="24" class="after">
             <h4 style="color:#0DB1AF">往期直播</h4>
             <van-col span="24">
               <van-col
@@ -71,7 +71,7 @@
                 </van-col>
               </van-col>
             </van-col>
-          </van-col>
+          </van-col> -->
           <van-col span="24" class="foot">
             <van-tabbar v-model="active">
               <van-tabbar-item icon="home-o" @click.native="$router.push({ path: '/live/index' })">首页</van-tabbar-item>
@@ -159,7 +159,7 @@ export default {
     if (this.token) {
       this.sesstoken();
     }
-    this.searchInfo();
+    // this.searchInfo();
   },
   methods: {
     ...mapMutations(['setUser']),
@@ -206,9 +206,9 @@ export default {
     }
   }
   .click {
-    border-bottom: 1px solid #ccc;
+    border-bottom: 0px solid #ccc;
     .btn {
-      padding: 5px 0;
+      padding: 15px 0;
       text-align: center;
       .icon {
         font-size: 40px;

+ 77 - 1
src/views/live/roomDetail.vue

@@ -64,7 +64,10 @@
               </el-col>
 
               <el-col :span="24" class="submit">
-                <el-col :span="20" class="input">
+                <el-col :span="2" class="supporticon">
+                  <van-icon name="gold-coin" size="30" color="#F56C6C" @click="supportShow = true" />
+                </el-col>
+                <el-col :span="18" class="input">
                   <el-input type="textarea" maxlength="5000" :rows="1" v-model="content"></el-input>
                 </el-col>
                 <el-col :span="4" class="btn">
@@ -126,6 +129,19 @@
         <van-button color="linear-gradient(to right, #4bb0ff, #6149f6)" @click="submitQuest">提交</van-button>
       </van-col>
     </van-popup>
+    <van-action-sheet v-model="supportShow" title="请选择打赏金额">
+      <van-col :span="24" class="supportmoney">
+        <van-radio-group v-model="order.money" direction="horizontal">
+          <van-radio name="0.01">0.01</van-radio>
+          <van-radio name="1.88">1.88</van-radio>
+          <van-radio name="8.88">8.88</van-radio>
+          <van-radio name="88.88">88.88</van-radio>
+        </van-radio-group>
+      </van-col>
+      <van-col :span="24" class="supportbtn">
+        <van-button icon="star-o" type="primary" @click="toSupport">按钮</van-button>
+      </van-col>
+    </van-action-sheet>
   </div>
 </template>
 
@@ -145,6 +161,7 @@ const { mapActions: gensign } = createNamespacedHelpers('gensign');
 const { mapActions: room } = createNamespacedHelpers('room');
 const { mapActions: quest } = createNamespacedHelpers('quest');
 const { mapActions: chat } = createNamespacedHelpers('chat');
+const { mapActions: mapWeiXin } = createNamespacedHelpers('weixin');
 export default {
   name: 'roomsDetail',
   props: {},
@@ -201,6 +218,8 @@ export default {
       stremOtherlist: [],
       swichzjrid: '',
       swichzjrstatus: false,
+      order: {},
+      supportShow: false,
     };
   },
   created() {
@@ -226,6 +245,7 @@ export default {
     ...chat(['query', 'create']),
     ...quest(['questfetch']),
     ...uploadquestion({ upcreate: 'create', upquery: 'query' }),
+    ...mapWeiXin(['support']),
     reviewVideo(newstrem, newid, oldstrem, oldid) {
       oldstrem.stop();
       newstrem.stop();
@@ -943,6 +963,53 @@ export default {
         }
       }
     },
+    async toSupport() {
+      this.$message({
+        message: '功能完善中',
+        type: 'success',
+      });
+      // let no = `support${this.getOrderNo()}`;
+      // this.order.orderno = no;
+      // const res = await this.support({ ...this.order, openid: this.user.openid });
+      // if (res.errcode === 0) {
+      //   this.toPay(res.data);
+      // }
+    },
+    getOrderNo() {
+      let y = new Date().getFullYear();
+      let m = new Date().getMonth() + 1;
+      m = m < 10 ? '0' + m : m;
+      let d = new Date().getDate();
+      d = d < 10 ? '0' + d : d;
+      let h = new Date().getHours();
+      h = h < 10 ? '0' + h : h;
+      let minute = new Date().getMinutes();
+      minute = minute < 10 ? '0' + minute : minute;
+      let second = new Date().getSeconds();
+      second = second < 10 ? '0' + second : second;
+      return y + m + d + h + minute + second;
+    },
+    async toPay(res) {
+      let data = {
+        appId: res.appId,
+        timeStamp: res.timeStamp,
+        nonceStr: res.nonceStr,
+        package: `prepay_id=${res.prepayId}`,
+        signType: 'MD5',
+        paySign: res.sign,
+      };
+      // eslint-disable-next-line no-undef
+      WeixinJSBridge.invoke('getBrandWCPayRequest', data, async res => {
+        if (res.err_msg == 'get_brand_wcpay_request:ok') {
+          const res = await this.pay({ doctorid: this.id, patientid: this.user.id, ...this.order });
+          if (res.errcode === 0) this.$toast({ message: '支持成功', type: 'success' });
+          else this.$toast({ message: '支持失败', type: 'fail' });
+        } else {
+          console.log(`pay fail`);
+          console.log(res);
+        }
+      });
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -1081,4 +1148,13 @@ export default {
     border-radius: 5px;
   }
 }
+.supportmoney {
+  padding: 20px 15px;
+  .van-radio {
+    padding: 20px 0;
+  }
+}
+.supportbtn {
+  text-align: center;
+}
 </style>

+ 1 - 1
src/views/meetingBrief/detail.vue

@@ -29,7 +29,7 @@
                     : newsInfo.type == '4'
                     ? '专家介绍'
                     : newsInfo.type == '5'
-                    ? '继续教育申请'
+                    ? '继续教育学分申请'
                     : newsInfo.type == '6'
                     ? '温馨提示'
                     : '暂无'

+ 1 - 1
src/views/meetingBrief/index.vue

@@ -31,7 +31,7 @@
                     : item.type == '4'
                     ? '专家介绍'
                     : item.type == '5'
-                    ? '继续教育申请'
+                    ? '继续教育学分申请'
                     : item.type == '6'
                     ? '温馨提示'
                     : '暂无'

+ 2 - 2
src/views/registered.vue

@@ -74,7 +74,7 @@
           maxlength="500"
           show-word-limit
         />
-        <van-field
+        <!-- <van-field
           v-model="form.remark"
           name="remark"
           left-icon="description"
@@ -85,7 +85,7 @@
           autosize
           maxlength="500"
           show-word-limit
-        />
+        /> -->
         <div style="margin: 16px;">
           <van-button round block type="info" native-type="submit">
             注册

+ 5 - 5
src/views/user/index.vue

@@ -68,7 +68,7 @@
               <van-popup round v-model="showPicker" position="bottom">
                 <van-picker show-toolbar :columns="addresslist" @confirm="onConfirm" @cancel="showPicker = false" />
               </van-popup>
-              <van-field
+              <!-- <van-field
                 v-model="form.title"
                 name="title"
                 label="简介"
@@ -79,8 +79,8 @@
                 autosize
                 maxlength="500"
                 show-word-limit
-              />
-              <van-field
+              /> -->
+              <!-- <van-field
                 v-model="form.remark"
                 name="remark"
                 left-icon="description"
@@ -91,10 +91,10 @@
                 autosize
                 maxlength="500"
                 show-word-limit
-              />
+              /> -->
               <div style="margin: 16px;">
                 <van-button round block type="info" native-type="submit">
-                  保存
+                  提交
                 </van-button>
               </div>
             </van-form>