Merge branch 'master' into dev_seam_intelligent

src/common/utils/fetch.js

@@ -1,53 +1,53 @@
 import store from '@/store/index'
 
 // 统一请求方法
-export default function fetch(url, params = {}, method = 'POST', showFail = true) {
-  let showLoading = true
-  if (params && params.notShowLoading) {
-    showLoading = false
-  }
-  if (showLoading) {
-    uni.showLoading({
-      mask: true,
-      title: '加载中...'
-    })
-  }
-  url = process.env.VUE_APP_BASE_URL + url
-  params.token = store.getters.token
-  params.student_id = params.student_id || store.getters.kid
-  return new Promise((resolve, reject) => {
-    uni.request({
-      url,
-      data: params,
-      method,
-      header: {},
-      success: (res) => {
-        uni.hideLoading()
-        // 0:错误; 1:正确; 10000:没有token -2: 需要绑定手机
-        const rs = res.data
-        if (rs && rs.code === 1) {
-          resolve(rs)
-        } else if (rs.code === 10000) {
-          // // 跳转至登录页
-          uni.showModal({
-            title: '请先登录',
-            content: '您还没有登录,请先去登录',
-            success: res => {
-              if (res.confirm) {
-                uni.navigateTo({ url: '/pages/login/index' })
-              }
-            }
-          })
-        } else {
-          if (showFail) uni.showToast({ title: rs.msg, icon: 'none', duration: 2000 })// 直接提示错误
-          resolve(rs)
-        }
-      },
-      fail: (err) => {
-        uni.hideLoading()
-        uni.showToast({ title: err, icon: 'none', duration: 2000 })
-        reject(err)
-      }
-    })
-  })
+export default function fetch (url, params = {}, method = 'POST', showFail = true) {
+	let showLoading = true
+	if (params && params.notShowLoading) {
+		showLoading = false
+	}
+	if (showLoading) {
+		uni.showLoading({
+			mask: true,
+			title: '加载中...'
+		})
+	}
+	url = process.env.VUE_APP_BASE_URL + url
+	params.token = store.getters.token
+	params.student_id = params.student_id || store.getters.kid
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url,
+			data: params,
+			method,
+			header: {},
+			success: (res) => {
+				uni.hideLoading()
+				// 0:错误; 1:正确; 10000:没有token -2: 需要绑定手机
+				const rs = res.data
+				if (rs && rs.code === 1) {
+					resolve(rs)
+				} else if (rs.code === 10000) {
+					// // 跳转至登录页
+					uni.showModal({
+						title: '请先登录',
+						content: '您还没有登录,请先去登录',
+						success: res => {
+							if (res.confirm) {
+								uni.navigateTo({ url: '/pages/login/index' })
+							}
+						}
+					})
+				} else {
+					if (showFail) uni.showToast({ title: rs.msg, icon: 'none', duration: 2000 })// 直接提示错误
+					resolve(rs)
+				}
+			},
+			fail: (err) => {
+				uni.hideLoading()
+				uni.showToast({ title: err, icon: 'none', duration: 2000 })
+				reject(err)
+			}
+		})
+	})
 }

src/pages/class/shoppingCart.vue

@@ -105,6 +105,18 @@ export default {
     socket.initSocket()
   },
   methods: {
+    subscribeMsg() {
+      return new Promise((resolve, reject) => {
+        uni.requestSubscribeMessage({
+          tmplIds: ['tfuaGZ8IOk0-JDKMcr5bVhUiiqvIORJHR_74VoPuWH4'],
+          success(res) {},
+          fail(res) {},
+          complete(res) {
+            resolve(true)
+          }
+        })
+      })
+    },
     checkChange(e) {
       this.checkedIds = e.detail.value.map(x => Number(x))
       this.shoppingList = this.list.filter(item => this.checkedIds.includes(item.shopping_id))
@@ -155,6 +167,12 @@ export default {
         uni.showToast({ title: '请先选择课程', icon: 'none', duration: 1000 })
         return false
       }
+      //订阅消息
+      this.subscribeMsg().then(res => {
+        this.placeOrder() //下单
+      })
+    },
+    placeOrder() {
       uni.showLoading({
         mask: true,
         title: '加载中...'
@@ -162,7 +180,7 @@ export default {
       const order = JSON.stringify(this.shoppingList)
       let carts = deepClone(this.carts)
       const shoppingCarts = this.shoppingList.map(item => item.class_attend_id)
-      carts = carts.filter(item => !shoppingCarts.includes(item))
+      carts = carts.filter(item => !shoppingCarts.includes(item)) //购物车存储
       _createOrder({ result: order, notShowLoading: true }).then(res => {
         this.$store.dispatch('setCarts', carts)
         setTimeout(() => {

src/pages/order/index.vue

@@ -213,6 +213,18 @@ export default {
     ...mapGetters(['ifReloadOrder'])
   },
   methods: {
+    subscribeMsg() {
+      return new Promise((resolve, reject) => {
+        uni.requestSubscribeMessage({
+          tmplIds: ['EsEmKKVj_rPTnLEDGjPTO9JRk1L3G0d9qh058FWXdJ4'],
+          success(res) {},
+          fail(res) {},
+          complete(res) {
+            resolve(true)
+          }
+        })
+      })
+    },
     refresh() {
       this.params.page = 1
       this.get_list()
@@ -271,19 +283,25 @@ export default {
     dropCourse(id) {
       const params = { order_info_id: id, refund_explanation: '', type_id: 0 }
       const _self = this
-      uni.showModal({
-        title: '提示',
-        content: '确定退课？',
-        cancelText: '取消',
-        confirmText: '确定',
-        success: res => {
-          if (res.confirm) {
-            _dropCourse(params).then(res => {
-              uni.showToast({ title: '已经发起退课,请耐心等待', icon: 'none' })
-              _self.refresh()
-            })
+      //订阅消息
+      this.subscribeMsg().then(res => {
+        //退单逻辑
+        uni.showModal({
+          title: '提示',
+          content: '确定退课？',
+          cancelText: '取消',
+          confirmText: '确定',
+          success: res => {
+            if (res.confirm) {
+              _dropCourse(params).then(rs => {
+                if (rs.code === 1) {
+                  uni.showToast({ title: '已经发起退课,请耐心等待', icon: 'none' })
+                  _self.refresh()
+                }
+              })
+            }
           }
-        }
+        })
       })
     },
     pay(id) {

src/pages/studentcenter/works.vue

@@ -1,12 +1,11 @@
 <template>
   <view class="page">
     <cu-custom :isBack="true" title="课堂作品"></cu-custom>
-    <scroll-view scroll-y="true" :style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
+    <scroll-view scroll-y="true" :style="[{ height: 'calc(100vh - ' + topHeader + 'px)' }]">
       <view class="content">
         <view class="course-img">
-          <swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay"
-            :interval="swiper.interval" :duration="swiper.duration">
-            <swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
+          <swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
+            <swiper-item v-for="(item, index) in detail.course_data.image" :key="index">
               <view class="swiper-item">
                 <image :src="item" mode="widthFix"></image>
               </view>
@@ -16,13 +15,14 @@
         <view>
           <view class="title margin-top-sm">课堂作品</view>
           <view class="list">
-            <view class="cu-card case" v-for="(item,index) in detail.student_comment_data.data" :key="index">
+            <view class="cu-card case" v-for="(item, index) in detail.student_comment_data.data" :key="index">
               <view class="cu-item shadow">
                 <view class="image">
-                  <view v-for="(img,i) in item.images" :key="i">
-                    <image :src="img" v-if="checkTypes(img,'imgs')" mode="aspectFit" style="width:100%;"></image>
-                    <video :src="img" v-if="checkTypes(img,'video')" style="width:100%;"></video>
+                  <view v-for="(img, i) in item.images" :key="i">
+                    <image :src="img" v-if="checkTypes(img, 'imgs')" mode="aspectFit" style="width: 100%;"></image>
+                    <video :src="img" v-if="checkTypes(img, 'video')" style="width: 100%;"></video>
                   </view>
+                  <view class="margin-bottom-xs">老师点评：{{ detail.teach_review_data.data[0].msg }}</view>
                 </view>
               </view>
             </view>
@@ -36,7 +36,7 @@
 <script>
 import { checkTypes } from '@/common/utils/index'
 export default {
-  data () {
+  data() {
     return {
       topHeader: this.globalCustomBarHeight,
       detail: {},
@@ -48,12 +48,12 @@ export default {
       }
     }
   },
-  onLoad () {
+  onLoad() {
     this.init()
   },
   methods: {
     checkTypes,
-    init () {
+    init() {
       this.detail = JSON.parse(uni.getStorageSync('daily_class'))
     }
   }