合并

babel.config.js

@@ -1,25 +1,27 @@
-// [["@vue/app", 
-//         { useBuiltIns: "entry",
-//         polyfills: [
-//             'es6.promise',
-//             'es6.symbol'
-//            ]},
-//     ]],
-// ["@vue/app"]
-module.exports = {
-    presets: [["@vue/app", 
-        { useBuiltIns: "entry",
-        polyfills: [
-            'es6.promise',
-            'es6.symbol'
-            ]},
-    ]],
-    plugins: [
-        ['import', {
-          libraryName: 'vant',
-          libraryDirectory: 'es',
-          style: name => `${name}/style/less`
-        }],
-        ["@babel/plugin-proposal-optional-chaining"]
-    ]
-}
+// [["@vue/app",
+//         { useBuiltIns: "entry",
+//         polyfills: [
+//             'es6.promise',
+//             'es6.symbol'
+//            ]},
+//     ]],
+// ["@vue/app"]
+module.exports = {
+  presets: [
+    [
+      "@vue/app",
+      { useBuiltIns: "entry", polyfills: ["es6.promise", "es6.symbol"] },
+    ],
+  ],
+  plugins: [
+    [
+      "import",
+      {
+        libraryName: "vant",
+        libraryDirectory: "es",
+        style: (name) => `${name}/style/less`,
+      },
+    ],
+    "@babel/plugin-proposal-optional-chaining",
+  ],
+};

dist/js/assistCenter.4c311d99.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["assistCenter"],{cf1c:function(t,e,o){"use strict";o.r(e);var r=function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div")},n=[],u={mounted:function(){var t=this.$route.query;t.Authorization&&(localStorage.setItem("Authorization",decodeURI(t.Authorization)),localStorage.setItem("userInfo",decodeURI(t.Authorization))),this.$router.replace("/rules")}},i=u,a=o("2877"),s=Object(a["a"])(i,r,n,!1,null,null,null);e["default"]=s.exports}}]);

dist/js/serviceStudent.10341502.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["serviceStudent"],{"29ee":function(t,e,n){},"83d6":function(t,e,n){"use strict";n("29ee")},d832:function(t,e,n){t.exports=n.p+"img/empty.86a09a9a.png"},fe60:function(t,e,n){"use strict";n.r(e);var s=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},c=[function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",{staticClass:"serviceStudent"},[s("img",{staticClass:"empty",attrs:{src:n("d832")}}),s("p",[t._v("敬请期待")])])}],i={name:"serviceStudent",data:function(){return{}},methods:{},mounted:function(){}},a=i,r=(n("83d6"),n("2877")),u=Object(r["a"])(a,s,c,!1,null,"b5228c3a",null);e["default"]=u.exports}}]);

package.json

@@ -22,6 +22,7 @@
     "js-storage": "^1.1.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
+    "numeral": "^2.0.6",
     "plyr": "^3.7.2",
     "qs": "^6.8.0",
     "vant": "^2.12.21",
@@ -29,12 +30,15 @@
     "vue": "^2.6.10",
     "vue-amap": "^0.5.10",
     "vue-awesome-swiper": "^3.1.3",
+    "vue-qr": "^4.0.9",
     "vue-router": "^3.0.3",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.9",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/cli": "^7.17.10",
+    "@babel/core": "^7.18.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.17.12",
+    "@babel/preset-env": "^7.3.4",
     "@vue/cli-plugin-babel": "^3.10.0",
     "@vue/cli-plugin-eslint": "^3.10.0",
     "@vue/cli-service": "^3.10.0",

src/api/app.js

@@ -155,6 +155,14 @@ const queryByOrderNo = (data) => {
   });
 };
 
+const queryOrderInfo = (data) => {
+  return axios({
+    url: api + "/eduPracticeGroup/queryOrderInfo",
+    method: "get",
+    params: data,
+  });
+};
+
 // 分页查询活动列表
 const queryByOrderNoAuth = (data) => {
   return axios({
@@ -249,6 +257,7 @@ export {
   createOrder,
   queryByOrderNo,
   queryByOrderNoAuth,
+  queryOrderInfo,
   getStuAndTeaReview,
   batchAdd,
   queryUserByPhone,

src/api/smallWeb.js

@@ -0,0 +1,96 @@
+const axios = require('@/common/axios').default
+const apiPrefix = '/api-web'
+import qs from 'qs'
+import request from '@/helpers/request'
+// 根据日期获取当日排课
+const getCourseSchedulesWithDate = (data) => {
+    return axios({
+        url: apiPrefix + '/educationCourseSchedule/getCourseSchedulesWithDate',
+        method: 'get',
+        params: data
+    })
+}
+
+// 获取老师
+const findTeachers = (data) => {
+    return axios({
+        url: apiPrefix + '/teacher/findTeachers',
+        method: 'get',
+        params: data
+    })
+}
+
+// 课程调整
+const classStartDateAdjust = (data) => {
+    return axios({
+        url: apiPrefix + '/courseSchedule/classStartDateAdjust',
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}
+
+// 课程调整
+const queryNameList = (data) => {
+    return axios({
+        url: apiPrefix + '/teacher/queryNameList',
+        method: 'get',
+        params: data
+    })
+}
+
+// 课程调整
+const courseSwap = (data) => {
+    return axios({
+        url: apiPrefix + '/educationCourseSchedule/courseSwap',
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}
+
+// 查询课程下学生考勤
+const findStudentAttendance = (data) => {
+    return axios({
+        url: apiPrefix + '/eduStudentAttendance/findStudentAttendance',
+        method: 'get',
+        params: data
+    })
+}
+
+// 查询最新协议
+const queryProduceContract = (data) => {
+    return axios({
+      url: '/api-web/eduContracts/queryProduceContract',
+      method: 'get',
+      params: data
+    })
+}
+
+// 查询VIP老师教学点
+const findVipSchoolByTeacher = (data) => {
+    return axios({
+        url: apiPrefix + '/school/findVipSchoolByTeacher',
+        method: 'get',
+        params: data
+    })
+}
+
+// 获取协议
+const getContract = (data) => {
+    return request({
+        url: `/tenantInfo/getContract/${data.id}`,
+        method: 'get',
+        params: data
+    })
+}
+
+export {
+    getCourseSchedulesWithDate,
+    findTeachers,
+    classStartDateAdjust,
+    queryNameList,
+    courseSwap,
+    findStudentAttendance,
+    queryProduceContract,
+    findVipSchoolByTeacher,
+    getContract
+}

src/common/common.js

@@ -1,13 +1,13 @@
 export const getRandomKey = () => {
-	let key = '' + new Date().getTime() + Math.floor(Math.random() * 1000000)
-	return key
-}
+  let key = "" + new Date().getTime() + Math.floor(Math.random() * 1000000);
+  return key;
+};
 
 export function getNowDateAndMonday(time) {
   let timestamp = new Date(time.replace(/-/g, "/")).getTime();
   let serverDate = new Date(time);
   if (serverDate.getDay() == 0) {
-      timestamp -= 7 * 24 * 60 * 60 * 1000;
+    timestamp -= 7 * 24 * 60 * 60 * 1000;
   }
   let mondayTime = timestamp - (serverDate.getDay() - 1) * 24 * 60 * 60 * 1000;
 
@@ -16,12 +16,12 @@ export function getNowDateAndMonday(time) {
   let mondayY = mondayData.getFullYear();
   //月
   let mondayM =
-      mondayData.getMonth() + 1 < 10
+    mondayData.getMonth() + 1 < 10
       ? "0" + (mondayData.getMonth() + 1)
       : mondayData.getMonth() + 1;
   //日
   let mondayD =
-      mondayData.getDate() < 10
+    mondayData.getDate() < 10
       ? "0" + mondayData.getDate()
       : mondayData.getDate();
 
@@ -34,19 +34,19 @@ export function getNowDateAndSunday(time) {
 
   let num = 7 - serverDate.getDay();
   if (num == 7) {
-      num = 0;
+    num = 0;
   }
   let sundayTiem = timestamp + num * 24 * 60 * 60 * 1000;
   let SundayData = new Date(sundayTiem);
   //年
   let tomorrowY = SundayData.getFullYear(); //月
   let tomorrowM =
-      SundayData.getMonth() + 1 < 10
+    SundayData.getMonth() + 1 < 10
       ? "0" + (SundayData.getMonth() + 1)
       : SundayData.getMonth() + 1;
   //日
   let tomorrowD =
-      SundayData.getDate() < 10
+    SundayData.getDate() < 10
       ? "0" + SundayData.getDate()
       : SundayData.getDate();
   let str = tomorrowY + "-" + tomorrowM + "-" + tomorrowD;
@@ -54,52 +54,55 @@ export function getNowDateAndSunday(time) {
 }
 
 const browser = () => {
-  var u = navigator.userAgent
+  var u = navigator.userAgent;
   //   app = navigator.appVersion;
   return {
-    trident: u.indexOf('Trident') > -1, //IE内核
-    presto: u.indexOf('Presto') > -1, //opera内核
-    webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
-    gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核
+    trident: u.indexOf("Trident") > -1, //IE内核
+    presto: u.indexOf("Presto") > -1, //opera内核
+    webKit: u.indexOf("AppleWebKit") > -1, //苹果、谷歌内核
+    gecko: u.indexOf("Gecko") > -1 && u.indexOf("KHTML") == -1, //火狐内核
     mobile: !!u.match(/AppleWebKit.*Mobile.*/), //是否为移动终端
     ios: !!u.match(/Mac OS X/), //ios终端
     // ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端
-    android: u.indexOf('DAYAAPPA') > -1 || u.indexOf('Adr') > -1, //android终端
-    iPhone: u.indexOf('DAYAAPPI') > -1, //是否为iPhone或者QQHD浏览器
-    isApp: u.indexOf('DAYAAPPI') > -1 || u.indexOf('DAYAAPPA') > -1 || u.indexOf('Adr') > -1,
-    iPad: u.indexOf('iPad') > -1, //是否iPad
-    webApp: u.indexOf('Safari') == -1, //是否web应该程序，没有头部与底部
-    weixin: u.indexOf('MicroMessenger') > -1, //是否微信 （2015-01-22新增）
-    qq: u.match(/\sQQ/i) == " qq" //是否QQ
-  }
-}
+    android: u.indexOf("DAYAAPPA") > -1 || u.indexOf("Adr") > -1, //android终端
+    iPhone: u.indexOf("DAYAAPPI") > -1, //是否为iPhone或者QQHD浏览器
+    isApp:
+      u.indexOf("DAYAAPPI") > -1 ||
+      u.indexOf("DAYAAPPA") > -1 ||
+      u.indexOf("Adr") > -1,
+    iPad: u.indexOf("iPad") > -1, //是否iPad
+    webApp: u.indexOf("Safari") == -1, //是否web应该程序，没有头部与底部
+    weixin: u.indexOf("MicroMessenger") > -1, //是否微信 （2015-01-22新增）
+    qq: u.match(/\sQQ/i) == " qq", //是否QQ
+  };
+};
 
 const calcMinute = (minute) => {
   if (minute <= 0) {
-    return '0分钟'
+    return "0分钟";
   }
-  let minutes = minute % 60 // 算出分钟
-  let hours = 0 // 小时
+  let minutes = minute % 60; // 算出分钟
+  let hours = 0; // 小时
   if (minute >= 60) {
-    hours = (minute - minutes) / 60
+    hours = (minute - minutes) / 60;
   }
-  let text = ''
+  let text = "";
   if (hours) {
-    text = hours + '小时'
+    text = hours + "小时";
   }
   if (minutes) {
-    text += minutes + '分钟'
+    text += minutes + "分钟";
   }
-  return text
-}
+  return text;
+};
 
 /**
  * 小于10的数变成 (0x)
- * @param {数值} num 
+ * @param {数值} num
  */
 const getSTD = (num) => {
-  return Number(num) >= 10 ? num : '0' + num
-}
+  return Number(num) >= 10 ? num : "0" + num;
+};
 
 /**
  * 获取格式化的年月日
@@ -107,60 +110,60 @@ const getSTD = (num) => {
  * @param {不是IOS里使用（多用于接口参数）} noIos
  */
 const getYMD = (time, noIos) => {
-  let tempDate = time || new Date()
-  if (typeof (tempDate) == 'string') {
-    tempDate = new Date(time.replace(/-/ig, '/'))
+  let tempDate = time || new Date();
+  if (typeof tempDate == "string") {
+    tempDate = new Date(time.replace(/-/gi, "/"));
   }
-  let t = noIos ? '-' : '/'
-  let month = getSTD(tempDate.getMonth() + 1)
-  let day = getSTD(tempDate.getDate())
-  return tempDate.getFullYear() + t + month + t + day
-}
+  let t = noIos ? "-" : "/";
+  let month = getSTD(tempDate.getMonth() + 1);
+  let day = getSTD(tempDate.getDate());
+  return tempDate.getFullYear() + t + month + t + day;
+};
 
 const getDateList = () => {
-  let getNowYear = new Date().getFullYear()
-  let getNowMonth = new Date().getMonth() + 1
-  const getDateList = {}
+  let getNowYear = new Date().getFullYear();
+  let getNowMonth = new Date().getMonth() + 1;
+  const getDateList = {};
   for (let i = 0; i < 12; i++) {
-    let months = []
+    let months = [];
     for (let j = 0; j < (i == 0 ? getNowMonth : 12); j++) {
-      months.push((j + 1) + '月')
+      months.push(j + 1 + "月");
     }
-    getDateList[(getNowYear - i) + '年'] = months // 组合数据
+    getDateList[getNowYear - i + "年"] = months; // 组合数据
   }
-  return getDateList
-}
+  return getDateList;
+};
 
 // 防抖
 const _debounce = (fn, delay) => {
-  delay = delay || 200
-  let timer
+  delay = delay || 200;
+  let timer;
   return function () {
-    let th = this
-    let args = arguments
+    let th = this;
+    let args = arguments;
     if (timer) {
-      clearTimeout(timer)
+      clearTimeout(timer);
     }
     timer = setTimeout(function () {
-      timer = null
-      fn.apply(th, args)
-    }, delay)
+      timer = null;
+      fn.apply(th, args);
+    }, delay);
   };
-}
+};
 
 // 节流
 const _throttle = (fn, time) => {
-  let canRun = true
+  let canRun = true;
   return function () {
-    let _arguments = arguments
-    if (!canRun) return
-    canRun = false
+    let _arguments = arguments;
+    if (!canRun) return;
+    canRun = false;
     setTimeout(() => {
-      fn.call(this, _arguments)
-      canRun = true
+      fn.call(this, _arguments);
+      canRun = true;
     }, time);
-  }
-}
+  };
+};
 // const _throttle = (fn, interval) => {
 //   let last
 //   let timer
@@ -180,19 +183,23 @@ const _throttle = (fn, time) => {
 // }
 // 学生地址
 const validStudentUrl = () => {
-  let url = window.location.href
-  let returnUrl = ''
-  if (/test/.test(url)) { // test环境
-    returnUrl = 'http://mstutest.dayaedu.com'
-  } else if (/dev/.test(url)) { // dev 环境
-    returnUrl = 'http://mstudev.dayaedu.com'
-  } else if (/online/.test(url)) { //线上
-    returnUrl = 'https://mstuonline.dayaedu.com'
-  } else { // 默认dev环境
-    returnUrl = 'http://mstudev.dayaedu.com'
+  let url = window.location.href;
+  let returnUrl = "";
+  if (/test/.test(url)) {
+    // test环境
+    returnUrl = "http://mstutest.dayaedu.com";
+  } else if (/dev/.test(url)) {
+    // dev 环境
+    returnUrl = "http://mstudev.dayaedu.com";
+  } else if (/online/.test(url)) {
+    //线上
+    returnUrl = "https://mstuonline.dayaedu.com";
+  } else {
+    // 默认test环境
+    returnUrl = "http://mstutest.dayaedu.com";
   }
-  return returnUrl
-}
+  return returnUrl;
+};
 
 /**
  * 转换金额为保留2位小数
@@ -206,16 +213,16 @@ const changeTwoDecimal = (amt) => {
   }
   f_x = Math.round(f_x * 100) / 100;
   let s_x = f_x.toString();
-  let pos_decimal = s_x.indexOf('.');
+  let pos_decimal = s_x.indexOf(".");
   if (pos_decimal < 0) {
     pos_decimal = s_x.length;
-    s_x += '.';
+    s_x += ".";
   }
   while (s_x.length <= pos_decimal + 2) {
-    s_x += '0';
+    s_x += "0";
   }
   return s_x;
-}
+};
 
 export {
   browser,
@@ -226,5 +233,5 @@ export {
   _debounce,
   _throttle,
   validStudentUrl,
-  changeTwoDecimal
-}
+  changeTwoDecimal,
+};

src/common/loading.js

@@ -1,14 +1,14 @@
-import { Toast } from 'vant'
-
-// 加载
-export default function setLoading(status) {
-    if(status) {
-        Toast.loading({
-            duration: 0, // 持续展示 toast
-            forbidClick: true,
-            message: '加载中...',
-        })
-    } else {
-        Toast.clear()
-    }
-}
+import { Toast } from "vant";
+
+// 加载
+export default function setLoading(status) {
+  if (status) {
+    Toast.loading({
+      duration: 0, // 持续展示 toast
+      forbidClick: true,
+      message: "加载中...",
+    });
+  } else {
+    Toast.clear();
+  }
+}

src/common/util.js

@@ -0,0 +1,292 @@
+import dayjs from "dayjs";
+/*
+ * @params key			名字
+ * @params value			值
+ * @params path			路径
+ * @params expireDays	存取的时间
+ */
+export function setCookie(key, value, path, expireDays) {
+  if (!key) return;
+  let extDate = new Date();
+  path = "path=" + (path || "") + "/;";
+  extDate.setDate(extDate.getDate() + (expireDays || 0));
+  expireDays = extDate.toGMTString();
+  document.cookie = key.trim() + "=" + value + ";" + path + expireDays;
+}
+
+export function delCookie(key) {
+  document.cookie = key + "=; path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;";
+}
+
+/**
+ * 获取cookie值
+ * @param name
+ * @returns {null}
+ */
+export const getCookie = function (name) {
+  let arr,
+    reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+  if (arr == document.cookie.match(reg)) {
+    return unescape(arr[2]);
+  } else {
+    return null;
+  }
+};
+
+export function setLocalStrage(key, value) {
+  if (!key || !window.localStorage) {
+    return;
+  } else {
+    window.localStorage.setItem(key.trim(), value);
+  }
+}
+
+export function delLocalSt(key) {
+  if (!key || !window.localStorage) {
+    return;
+  } else {
+    window.localStorage.removeItem(key);
+  }
+}
+
+export function getLocalStrage(key) {
+  if (!key || !window.localStorage) {
+    return;
+  } else {
+    window.localStorage.getItem(key);
+  }
+}
+
+export const getRandomKey = () => {
+  let key = "" + new Date().getTime() + Math.floor(Math.random() * 1000000);
+  return key;
+};
+
+export function browser() {
+  var u = navigator.userAgent;
+  //   app = navigator.appVersion;
+  return {
+    trident: u.indexOf("Trident") > -1, //IE内核
+    presto: u.indexOf("Presto") > -1, //opera内核
+    webKit: u.indexOf("AppleWebKit") > -1, //苹果、谷歌内核
+    gecko: u.indexOf("Gecko") > -1 && u.indexOf("KHTML") == -1, //火狐内核
+    mobile: !!u.match(/AppleWebKit.*Mobile.*/), //是否为移动终端
+    ios: !!u.match(/Mac OS X/), //ios终端
+    // ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端
+    android: u.indexOf("DAYAAPPA") > -1 || u.indexOf("Adr") > -1, //android终端
+    iPhone: u.indexOf("DAYAAPPI") > -1, //是否为iPhone或者QQHD浏览器
+    isApp:
+      u.indexOf("DAYAAPPI") > -1 ||
+      u.indexOf("DAYAAPPA") > -1 ||
+      u.indexOf("Adr") > -1,
+    iPad: u.indexOf("iPad") > -1, //是否iPad
+    webApp: u.indexOf("Safari") == -1, //是否web应该程序，没有头部与底部
+    weixin: u.indexOf("MicroMessenger") > -1, //是否微信 （2015-01-22新增）
+    huawei: !!u.match(/huawei/i) || !!u.match(/honor/i),
+    xiaomi: !!u.match(/mi\s/i) || !!u.match(/redmi/i) || !!u.match(/mix/i),
+  };
+}
+
+// 获取时分秒
+export function utilDateInfo(date) {
+  if (typeof date == "string") {
+    date = date.replace(/-/gi, "/");
+  }
+  let d = new Date(date);
+  let hour = d.getHours() >= 10 ? d.getHours() : "0" + d.getHours();
+  let minute = d.getMinutes() >= 10 ? d.getMinutes() : "0" + d.getMinutes();
+  return hour + ":" + minute + ":00";
+}
+
+// 获取年月日
+export function utilDate(date, type) {
+  if (typeof date == "string") {
+    date = date.replace(/-/gi, "/");
+  }
+  let d = new Date(date);
+  let year = d.getFullYear() >= 10 ? d.getFullYear() : "0" + d.getFullYear();
+  let month =
+    d.getMonth() + 1 >= 10 ? d.getMonth() + 1 : "0" + (d.getMonth() + 1);
+  let day = d.getDate() >= 10 ? d.getDate() : "0" + d.getDate();
+
+  if (type == "ios") {
+    return year + "/" + month + "/" + day;
+  }
+  return year + "-" + month + "-" + day;
+}
+
+/**
+ * 小于10的数变成 (0x)
+ * @param {数值} num
+ */
+export function getSTD(num) {
+  return Number(num) >= 10 ? num : "0" + num;
+}
+
+/**
+ * 获取格式化的年月日
+ * @param {日期} time
+ * @param {不是IOS里使用（多用于接口参数）} noIos
+ */
+export function getYMD(time, noIos) {
+  let tempDate = time || new Date();
+  if (typeof tempDate == "string") {
+    tempDate = new Date(time.replace(/-/gi, "/"));
+  }
+  let t = noIos ? "-" : "/";
+  let month = getSTD(tempDate.getMonth() + 1);
+  let day = getSTD(tempDate.getDate());
+  return tempDate.getFullYear() + t + month + t + day;
+}
+
+/**
+ *
+ * @param {周几的索引值} index
+ */
+export function getWeekString(index) {
+  let weekText = [
+    "星期日",
+    "星期一",
+    "星期二",
+    "星期三",
+    "星期四",
+    "星期五",
+    "星期六",
+  ];
+  return weekText[index];
+}
+
+/**
+ * 手机号验证
+ * @param {手机号} phoneNumber
+ */
+export function checkPhone(phoneNumber) {
+  let result = true;
+  if (!/^1(3|4|5|6|7|8|9)\d{9}$/.test(phoneNumber)) {
+    result = false;
+  }
+  return result;
+}
+
+// 学生地址
+export function validStudentUrl() {
+  let url = window.location.href;
+  let returnUrl = "";
+  if (/test/.test(url)) {
+    // test环境
+    returnUrl = "http://mstutest.dayaedu.com";
+  } else if (/dev/.test(url)) {
+    // dev 环境
+    returnUrl = "http://mstudev.dayaedu.com";
+  } else if (/online/.test(url)) {
+    //线上
+    returnUrl = "https://mstuonline.dayaedu.com";
+  } else {
+    // 默认test环境
+    returnUrl = "http://mstutest.dayaedu.com";
+  }
+  return returnUrl;
+}
+
+// 老师地址
+export function validTeacherUrl() {
+  let url = window.location.href;
+  let returnUrl = "";
+  if (/test/.test(url)) {
+    // test环境
+    returnUrl = "http://mteatest.dayaedu.com";
+  } else if (/dev/.test(url)) {
+    // dev 环境
+    returnUrl = "http://mteadev.dayaedu.com";
+  } else if (/online/.test(url)) {
+    //线上
+    returnUrl = "https://mteaonline.dayaedu.com";
+  } else {
+    // 默认test环境
+    returnUrl = "http://mteatest.dayaedu.com";
+  }
+  return returnUrl;
+}
+
+/**
+ * @desc 函数防抖
+ * @param func 目标函数
+ * @param wait 延迟执行毫秒数
+ */
+export function debounce(func, wait) {
+  let timeout = null;
+  return function () {
+    let context = this;
+    let args = arguments;
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      func.apply(context, args);
+    }, wait);
+  };
+}
+
+/**
+ * @desc 函数节流
+ * @param func 函数
+ * @param wait 延迟执行毫秒数
+ */
+export function throttle(func, wait) {
+  let timeout = null;
+  return function () {
+    let context = this;
+    let args = arguments;
+    if (!timeout) {
+      timeout = setTimeout(() => {
+        timeout = null;
+        func.apply(context, args);
+      }, wait);
+    }
+  };
+}
+
+/**
+ * 转换金额为保留2位小数
+ * @param x
+ * @returns 强制保留2位小数的金额
+ */
+export function changeTwoDecimal(amt) {
+  let f_x = parseFloat(amt);
+  if (isNaN(f_x)) {
+    return "0.00";
+  }
+  f_x = Math.round(f_x * 100) / 100;
+  let s_x = f_x.toString();
+  let pos_decimal = s_x.indexOf(".");
+  if (pos_decimal < 0) {
+    pos_decimal = s_x.length;
+    s_x += ".";
+  }
+  while (s_x.length <= pos_decimal + 2) {
+    s_x += "0";
+  }
+  return s_x;
+}
+
+export function addTimerFormMinute(classDate, startTime, time) {
+  let endTime = dayjs(classDate + " " + startTime).add(time, "minute");
+  if (!dayjs(classDate + " " + "23:59:59").isBefore(endTime)) {
+    return endTime.format("HH:mm:ss");
+  } else {
+    return "";
+  }
+}
+
+export function diffTimerFormMinute(classDate, startTime, endTime) {
+  return Math.abs(
+    dayjs(classDate + " " + startTime).diff(classDate + " " + endTime, "Minute")
+  );
+}
+
+export function timerFormMinute(classDate, startTime, time) {
+  let endTime = dayjs(classDate + " " + startTime).add(time, "minute");
+  if (!dayjs(classDate + " " + "21:00").isBefore(endTime)) {
+    return endTime.format("HH:mm");
+  } else {
+    return "";
+  }
+}

src/common/vueFilters.js

@@ -1,118 +1,152 @@
-import Vue from 'vue'
-import * as constant from '../constant'
+import Vue from "vue";
+import * as constant from "../constant";
+import numeral from "numeral";
 
 // 乐团状态
-Vue.filter('bandStatus', value => {
-    let templateStatus = {
-        APPLY: '报名中',
-        PAY: '缴费中',
-        PREPARE: '筹备中',
-        UNDERWAY: '进行中',
-        CANCELED: '取消'
-    }
-    return templateStatus[value]
-})
+Vue.filter("bandStatus", (value) => {
+  let templateStatus = {
+    APPLY: "报名中",
+    PAY: "缴费中",
+    PREPARE: "筹备中",
+    UNDERWAY: "进行中",
+    CANCELED: "取消",
+  };
+  return templateStatus[value];
+});
+
+// 商品类型
+Vue.filter("shopType", (value) => {
+  let template = {
+    INSTRUMENT: "乐器",
+    ACCESSORIES: "辅件",
+    TEACHING: "教材",
+    STAFF: "教谱",
+    OTHER: "其它",
+  };
+  return template[value];
+});
+
+// 金额格式化
+Vue.filter("moneyFormat", (value) => {
+  return numeral(value).format("0,0.00");
+});
+
+// 金额格式化，不要多余的0
+Vue.filter("moneyFormat2", (value) => {
+  const str = numeral(value).format("0,0.00");
+  const nums = str.split(".");
+  const result = [nums[0]];
+  const subfix = parseFloat("." + nums[1]);
+  if (subfix > 0) {
+    result.push(("" + subfix).replace("0.", ""));
+  }
+  return result.join(".");
+});
+
+Vue.filter("numberFormat", (value) => {
+  return numeral(value).format("0,0");
+});
 
 // 课程类型
-Vue.filter('coursesType', val => constant.courseType[val])
+Vue.filter("coursesType", (val) => constant.courseType[val]);
 
 // 合并数组
-Vue.filter('joinArray', (value, type) => {
-    if (!type) {
-        type = ' '
-    }
-    if (typeof value == 'object' && value != null) {
-        return value.join(type)
-    } else {
-        return value
-    }
-})
+Vue.filter("joinArray", (value, type) => {
+  if (!type) {
+    type = " ";
+  }
+  if (typeof value == "object" && value != null) {
+    return value.join(type);
+  } else {
+    return value;
+  }
+});
 
 // 数据类型
-Vue.filter('dataStatusCN', value => {
-    let templateStatus = {
-        '到课': '',
-        '请假': 'truant',
-        '旷课': 'leave'
-    }
-    return templateStatus[value]
-})
+Vue.filter("dataStatusCN", (value) => {
+  let templateStatus = {
+    到课: "",
+    请假: "truant",
+    旷课: "leave",
+  };
+  return templateStatus[value];
+});
 
 // 考勤类型
-Vue.filter('clockingIn', value => {
-    let templateStatus = {
-        NORMAL: "正常",
-        TRUANT: "旷课",
-        LEAVE: "请假",
-        QUIT_SCHOOL: "休学",
-        DROP_OUT: "退学",
-        LATE: "迟到",
-    }
-    return templateStatus[value]
-})
+Vue.filter("clockingIn", (value) => {
+  let templateStatus = {
+    NORMAL: "正常",
+    TRUANT: "旷课",
+    LEAVE: "请假",
+    QUIT_SCHOOL: "休学",
+    DROP_OUT: "退学",
+    LATE: "迟到",
+  };
+  return templateStatus[value];
+});
 
 // 课程类型
-Vue.filter('teachModeStatus', value => {
-    let templateStatus = {
-        ONLINE: "线上课",
-        OFFLINE: "线下课"
-    }
-    return templateStatus[value]
-})
+Vue.filter("teachModeStatus", (value) => {
+  let templateStatus = {
+    ONLINE: "线上课",
+    OFFLINE: "线下课",
+  };
+  return templateStatus[value];
+});
 
 // 消耗类型
-Vue.filter('periodRecordStatus', value => {
-    let templateStatus = {
-        NOT_START: "未开始",
-        APPLYING: "报名中",
-        NORMAL: "正常",
-        LOCK: "锁定",
-        FINISH: "结束",
-        CANCEL: "取消"
-    }
-    return templateStatus[value]
-})
+Vue.filter("periodRecordStatus", (value) => {
+  let templateStatus = {
+    NOT_START: "未开始",
+    APPLYING: "报名中",
+    NORMAL: "正常",
+    LOCK: "锁定",
+    FINISH: "结束",
+    CANCEL: "取消",
+  };
+  return templateStatus[value];
+});
 
 // 计算分钟数
-Vue.filter('calcMinute', (minute) => {
-    if (minute <= 0) {
-        return '0分钟'
-    }
-    let minutes = minute % 60 // 算出分钟
-    let hours = 0 // 小时
-    if (minute >= 60) {
-        hours = (minute - minutes) / 60
-    }
-    let text = ''
-    if (hours) {
-        text = hours + '小时'
-    }
-    if (minutes) {
-        text += minutes + '分钟'
-    }
-    return text
-})
+Vue.filter("calcMinute", (minute) => {
+  if (minute <= 0) {
+    return "0分钟";
+  }
+  let minutes = minute % 60; // 算出分钟
+  let hours = 0; // 小时
+  if (minute >= 60) {
+    hours = (minute - minutes) / 60;
+  }
+  let text = "";
+  if (hours) {
+    text = hours + "小时";
+  }
+  if (minutes) {
+    text += minutes + "分钟";
+  }
+  return text;
+});
 
-Vue.filter('formatDate', value => {
-    let d = new Date(value.replace(/-/ig, '/'))
-    let hour = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()
-    let minute = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes()
-    return hour + ':' + minute
-})
+Vue.filter("formatDate", (value) => {
+  let d = new Date(value.replace(/-/gi, "/"));
+  let hour = d.getHours() >= 10 ? d.getHours() : "0" + d.getHours();
+  let minute = d.getMinutes() >= 10 ? d.getMinutes() : "0" + d.getMinutes();
+  return hour + ":" + minute;
+});
 
-Vue.filter('formatTimer', (value) => {
-    if (value) {
-      return value.split(' ')[0]
-    } else {
-      return value
-    }
-  })
+Vue.filter("formatTimer", (value) => {
+  if (value) {
+    return value.split(" ")[0];
+  } else {
+    return value;
+  }
+});
 
 // 格式化单位
-Vue.filter('formatUnit', value => {
-    const template = {
-        1: '元',
-        2: '%'
-    }
-    return template[value]
-})
+Vue.filter("formatUnit", (value) => {
+  const template = {
+    1: "元",
+    2: "%",
+  };
+  return template[value];
+});

src/components/MProtocol.vue

@@ -0,0 +1,104 @@
+<template>
+    <div class="mProtocol" id="mProtocol">
+        <m-header  :backUrl="backUrlProtocol" name="协议信息" />
+        <div v-html="protocolHTML" style="margin-bottom: 1rem;"></div>
+        <div class="btn-style">
+            <van-button v-if="!tenantId" class="protocol-btn" @click="onPopupSure" type="info">确认</van-button>
+            <van-button v-else class="protocol-btn" round :disabled="disabled" @click="onPopupSure" type="info">
+                {{ disabled ? '请认真阅读协议内容' : '我已完全阅读并同意协议内容' }}
+                <van-count-down
+                    ref="countDown"
+                    v-show="disabled"
+                    :time="6000"
+                    style="font-size: .18rem;display: inline-block;color: #fff;"
+                    format="ss"
+                    @finish="finish"
+                />
+            </van-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import MHeader from '@/components/MHeader'
+// import { browser }  from '@/common/util'
+export default {
+    name: 'mProtocol',
+    components: { MHeader },
+    props: {
+        protocolHTML: String,
+        tenantId: {
+            type: [String, Number]
+        },
+        checked: Boolean,
+        popupStatus: Boolean
+    },
+    data() {
+        let that = this
+        return {
+            disabled: true, // 按钮是否禁用
+            headerStatus: false,
+            // protocolHTML: null,
+            backUrlProtocol: {
+                callBack() {
+                    that.callBack()
+                }
+            }
+        }
+    },
+    mounted() {
+        // if(!browser().android && !browser().iPhone) {
+        //     this.headerStatus = true
+        // }
+        if(this.checked) { // 默认选中时
+            this.disabled = false
+        }
+    },
+    methods: {
+        finish() {
+            this.disabled = false
+        },
+        onPopupSure() {
+            document.querySelector('#mProtocol').scrollTop = 0
+            // 协议确定
+            this.$emit('onPopupSure')
+        },
+        callBack() {
+            document.querySelector('#mProtocol').scrollTop = 0
+            this.$emit('onClose')
+        }
+    },
+    watch: {
+        popupStatus(newValue) {
+            if(newValue && !this.checked) {
+                this.disabled = true
+                this.$refs.countDown.reset();
+                this.$refs.countDown.start();
+            } else {
+                this.disabled = false
+            }
+        }
+    }
+}
+</script>
+
+<style lang="less">
+.protocol-btn {
+    // margin: 0.35rem 0;
+    background: #01C1B5;
+    color: #fff;
+    font-size: 0.18rem;
+    border-radius: 0.5rem;
+    text-align: center;
+    width: 100%;
+}
+.btn-style {
+    padding: 0.15rem 4% .2rem;
+    position: fixed;
+    z-index: 99;
+    bottom: 0;
+    left: 0;
+    width: 92%;
+    background: #fff;
+}
+</style>

src/components/MRefund.vue

@@ -0,0 +1,507 @@
+<template>
+  <div class="mRefund">
+    <m-header :backUrl="backUrlProtocol" name="退费规则" />
+    <div class="importTip" v-if="idss.length > 0&&tenantId==1">
+      <h3 class="title">重要须知</h3>
+      <p
+        v-for="(id, index) in idss"
+        :key="id"
+        v-html="++index + '、' + importText[id]"
+      ></p>
+    </div>
+    <div class="course">
+      <h3 class="title">您本次购买的产品及服务信息如下：</h3>
+      <div class="service">
+        <van-row class="title">
+          <van-col span="9" offset="1">名称</van-col>
+          <van-col span="6" offset="1">类型</van-col>
+          <van-col span="6" offset="1">价格</van-col>
+        </van-row>
+        <van-row class="value" v-for="(item, index) in buyList" :key="index">
+          <van-col span="9" offset="1">{{ item.name }}</van-col>
+          <van-col span="6" offset="1">{{ item.type }}</van-col>
+          <van-col span="6" offset="1" style="color: #f85043"
+            >￥{{ moneyFormat(item.price) }}</van-col
+          >
+        </van-row>
+        <!-- <van-row class="title allMoney">
+          <van-col span="9" offset="1">订单总金额</van-col>
+          <van-col span="6" offset="1"></van-col>
+          <van-col span="6" offset="1" style="color: #f85043"
+            >￥{{ moneyFormat(allPrice) }}</van-col
+          >
+        </van-row> -->
+      </div>
+      <div class="money">
+        <div class="service">
+          <van-row class="allMoney value">
+            <van-col span="9" offset="1">订单总金额</van-col>
+            <van-col span="6" offset="1"></van-col>
+            <van-col span="6" offset="1" style="color: #f85043"
+              >￥{{ moneyFormat(allPrice) }}</van-col
+            >
+          </van-row>
+          <van-row class="allMoney value" v-if="balancePrice > 0">
+            <van-col span="9" offset="1">余额支付</van-col>
+            <van-col span="6" offset="1"></van-col>
+            <van-col span="6" offset="1" style="color: #f85043"
+              >￥{{ -moneyFormat(balancePrice) }}</van-col
+            >
+          </van-row>
+        </div>
+      </div>
+    </div>
+    <Mcoupon
+      class="Mcoupon"
+      ref="Mcoupon"
+      :showCoupon="true"
+      :showBalance="balance > 0"
+      :balance="balance"
+      @onClickCheckbox="onClickCheckbox"
+      :payType="payType"
+      :buyList="buyList"
+      @setCoupon="setCoupon"
+    />
+    <div class="buyWall"></div>
+    <div class="buy">
+      <div class="price">
+        <!-- <p class="oldprice">
+          <del class="text">原价</del>
+          <del style="font-size: 0.14rem"
+            >￥{{ marketPrice | moneyFormat }}</del
+          >
+        </p> -->
+        <p class="now_price">
+          <span class="text">仅需支付</span>
+          <span style="font-weight: bold">￥{{ showPrice | moneyFormat }}</span>
+        </p>
+      </div>
+      <a class="btn-submit" @click="onPopupSure" v-if="!btnName">{{
+        orderNo ? "支付" : "购买"
+      }}</a>
+       <a v-else class="btn-submit" @click="onPopupSure">{{
+        btnName
+      }}</a>
+    </div>
+    <!-- <div class="course" v-if="disCountList.length > 0">
+      <h3 class="title">优惠信息</h3>
+      <div class="service">
+        <van-row class="title">
+          <van-col span="9" offset="1">名称</van-col>
+          <van-col span="6" offset="1">类型</van-col>
+          <van-col span="6" offset="1">价格</van-col>
+        </van-row>
+        <div class="value" v-for="(item, index) in disCountList" :key="index">
+          <van-row>
+            <van-col span="9" offset="1" v-html="item.name"></van-col>
+            <van-col span="6" offset="1">{{ item.type }}</van-col>
+            <van-col span="6" offset="1" style="color: #f85043"
+              >￥{{ moneyFormat(item.price) }}</van-col
+            >
+          </van-row>
+          <van-row v-if="item.time">
+            <van-col
+              offset="1"
+              style="padding-top: 0.05rem; font-size: 0.12rem; color: #808080"
+            >
+              {{ item.time }}
+            </van-col>
+          </van-row>
+          <van-row v-if="item.childGoodsName">
+            <van-col offset="1" style="padding-top: 0.05rem">
+              <span
+                v-for="(child, index) in item.childGoodsName"
+                :key="child.id"
+                style="font-size: 0.12rem; color: #808080"
+                >{{ child }}
+                {{ item.childGoodsName.length - 1 == index ? "" : "、" }}</span
+              >
+            </van-col>
+          </van-row>
+        </div>
+        <van-row class="title allMoney">
+          <van-col span="9" offset="1">优惠总金额</van-col>
+          <van-col span="6" offset="1"></van-col>
+          <van-col span="6" offset="1" style="color: #f85043"
+            >￥{{ moneyFormat(disCountPrice) }}</van-col
+          >
+        </van-row>
+      </div>
+    </div> -->
+    <!-- <div class="course" v-if="moneyList.length > 0">
+      <h3 class="title">支付信息</h3>
+      <div class="service">
+        <van-row class="title">
+          <van-col span="15" offset="1">支付方式</van-col>
+          <van-col span="6" offset="1">价格</van-col>
+        </van-row>
+        <div class="value" v-for="(item, index) in moneyList" :key="index">
+          <van-row>
+            <van-col span="15" offset="1" v-html="item.name"></van-col>
+            <van-col span="6" offset="1" style="color: #f85043"
+              >￥{{ moneyFormat(item.price) }}</van-col
+            >
+          </van-row>
+          <van-row v-if="item.time">
+            <van-col
+              offset="1"
+              style="padding-top: 0.05rem; font-size: 0.12rem; color: #808080"
+            >
+              {{ item.time }}
+            </van-col>
+          </van-row>
+          <van-row v-if="item.childGoodsName">
+            <van-col offset="1" style="padding-top: 0.05rem">
+              <span
+                v-for="(child, index) in item.childGoodsName"
+                :key="child.id"
+                style="font-size: 0.12rem; color: #808080"
+                >{{ child }}
+                {{ item.childGoodsName.length - 1 == index ? "" : "、" }}</span
+              >
+            </van-col>
+          </van-row>
+        </div>
+      </div>
+    </div> -->
+
+    <!-- <div style="padding: 0 0.15rem">
+      <van-button class="protocol-btn" @click="onPopupSure" type="info"
+        >确认</van-button
+      >
+    </div> -->
+  </div>
+</template>
+
+<script>
+import Mcoupon from "@/components/Mcoupon.vue";
+import MHeader from "@/components/MHeader";
+import { browser } from "@/common/util";
+import numeral from "numeral";
+export default {
+  name: "mRefund",
+  components: { MHeader, Mcoupon },
+  props: {
+    ids: {
+      type: Array,
+      default() {
+        return [1, 2, 3, 4, 5, 6];
+      },
+    },
+    buyList: {
+      type: Array,
+    },
+    disCountList: {
+      type: Array,
+    },
+    moneyList: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    orderNo: {
+      type: Number || String,
+      default() {
+        return 0;
+      },
+    },
+    balance: [Number, String],
+    btnName: {
+      type: Boolean || String,
+      default() {
+        return false;
+      },
+    },
+  },
+  data() {
+    let that = this;
+    return {
+      headerStatus: false,
+      importText: {
+        1: "乐器、教辅、配件等，未经签收，自购买缴款之日起15日内可申请退款，超过上述期限则不予受理退费申请；非因商品本身存在质量问题，一经签收，无论使用与否，均不予退费；",
+        2: "乐保服务，在维修老师下校检查前可申请退款，下校检查日过后则不予退费；",
+        3: "AMR器乐练习系统服务，自购买缴款之日起15日内可申请退款，超过上述期限或实际已提供相应服务则一律不予受理退费；",
+        4: "正价购买的个别课程，包括但不限于VIP课程项下一对一、网管课等，课程有效期内可申请退费，可退款金额为：购买金额-课时原价*已消耗课时数量；",
+        5: "活动期间以优惠价格购买的个别课程，自购买缴款之日起15日内可申请退款，超过上述期限或实际已发生课时消耗的则一律不予受理退费；",
+        6: "所有退款均按照退款金额的千分之五收取手续费；",
+      },
+      // protocolHTML: null,
+      backUrlProtocol: {
+        callBack() {
+          that.callBack();
+        },
+      },
+      payType: false,
+      payCountMoney: 0,
+      valuePirce: 0,
+      couponIdList: [],
+      tenantId:null
+    };
+  },
+  mounted() {
+    if (!browser().android && !browser().iPhone) {
+      this.headerStatus = true;
+    }
+    if (this.ids.indexOf(6) == -1) {
+      this.ids.push(6);
+    }
+    this.tenantId = sessionStorage.getItem('tenantId')
+  },
+  methods: {
+    onPopupSure() {
+      // 协议确定
+      let obj = {
+        pageShowPrice: this.pageShowPrice,
+        amount: this.needPrice,
+        payType: this.payType,
+        couponIdList: this.couponIdList,
+      };
+      this.$emit("onPopupSure", obj);
+    },
+    callBack() {
+      this.$emit("onClose");
+    },
+    moneyFormat(value) {
+      return numeral(value).format("0.00");
+    },
+    setCoupon(obj) {
+      this.$emit("setCoupon", obj);
+      // console.log(obj, "setCoupon");
+      this.valuePirce = obj.valuePirce;
+      this.couponIdList = obj.couponList;
+    },
+    onClickCheckbox() {
+      this.payType = !this.payType;
+    },
+  },
+  computed: {
+    allPrice() {
+      let allMoney = 0;
+      this.buyList.forEach((item) => {
+        allMoney += Number(item.price);
+      });
+      return allMoney;
+    },
+    disCountPrice() {
+      let disCountMoney = 0;
+      this.disCountList.forEach((item) => {
+        disCountMoney += Number(item.price);
+      });
+      return disCountMoney;
+    },
+    idss() {
+      if (this.ids.indexOf(6) == -1) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.ids.push(6);
+      }
+      return this.ids;
+    },
+    needPrice() {
+      // allPrice - 余额 -优惠券
+      // let amount = 0;
+      // if (this.payType) {
+      //   if (this.allPrice - this.valuePirce >= this.balance) {
+      //     amount = Number(
+      //       (this.allPrice  - this.valuePirce).toFixed(2)
+      //     );
+      //   } else {
+      //     amount = 0;
+      //   }
+      //   // 使用余额
+      // } else {
+      //   // 不使用余额
+      //   amount = this.allPrice - this.valuePirce;
+      // }
+      return Number((this.allPrice - this.valuePirce).toFixed(2));
+    },
+    balancePrice() {
+      let balance = 0;
+      if (this.payType) {
+        if (this.allPrice - this.valuePirce >= this.balance) {
+          balance = this.balance;
+        } else {
+          balance = Number(this.allPrice - this.valuePirce);
+        }
+      }
+      return Number(balance);
+    },
+    pageShowPrice() {
+      // allPrice - 余额 -优惠券
+      let amount = 0;
+      if (this.payType) {
+        if (this.allPrice - this.valuePirce >= this.balance) {
+          amount = Number(
+            (this.allPrice - this.valuePirce - this.balance).toFixed(2)
+          );
+        } else {
+          amount = 0;
+        }
+        // 使用余额
+      } else {
+        // 不使用余额
+        amount = this.allPrice - this.valuePirce;
+      }
+      return Number(amount)
+    },
+    showPrice() {
+      // allPrice - 余额 -优惠券
+      let amount = 0;
+      if (this.payType) {
+        if (this.allPrice - this.valuePirce >= this.balance) {
+          amount = Number(
+            (this.allPrice - this.valuePirce - this.balance).toFixed(2)
+          );
+        } else {
+          amount = 0;
+        }
+        // 使用余额
+      } else {
+        // 不使用余额
+        amount = this.allPrice - this.valuePirce;
+      }
+      return Number(amount).toFixed(2);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.mRefund {
+  background-color: #f3f4f8;
+  min-height: 100vh;
+  overflow: hidden;
+}
+
+.refund-btn {
+  margin: 0.15rem 0 0.35rem;
+  background: #01c1b5;
+  color: #fff;
+  font-size: 0.18rem;
+  text-align: center;
+  width: 100%;
+}
+
+.importTip,
+.course {
+  background: #ffffff;
+  border-radius: 0.08rem;
+  margin: 0.15rem;
+  padding: 0.15rem;
+  overflow: hidden;
+
+  h3 {
+    font-size: 0.14rem;
+    font-weight: 400;
+    padding-bottom: 0.05rem;
+
+    &.title {
+      font-size: 0.16rem;
+      line-height: 0.28rem;
+      font-weight: bold;
+      padding-bottom: 0.05rem;
+
+      &::before {
+        content: " ";
+        width: 0.04rem;
+        height: 0.15rem;
+        background: #01c1b5;
+        display: inline-block;
+        margin-right: 0.07rem;
+        border-radius: 8px;
+        position: relative;
+        top: 0.01rem;
+      }
+    }
+  }
+
+  p {
+    font-size: 0.13rem;
+    line-height: 1.8;
+    color: #808080;
+  }
+}
+
+.service {
+  font-size: 0.13rem;
+
+  .title {
+    padding: 0.05rem 0;
+    background: #f1f1f1;
+    color: #959595;
+  }
+
+  .value {
+    padding: 0.1rem 0;
+    border-bottom: 1px solid #f1f1f1;
+  }
+}
+.allMoney.title {
+  // margin-top: .1rem;
+  font-weight: bold;
+  color: #000;
+}
+.buyWall {
+  height: 0.55rem;
+}
+.buy {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 0.55rem;
+  display: flex;
+  align-items: center;
+  padding: 0 0.2rem;
+  border-top: 1px solid #f0f0f0;
+  color: #000000;
+  font-size: 0.12rem;
+  background: #fff;
+
+  .price {
+    flex: 1;
+    font-size: 0.16rem;
+  }
+
+  font-size: 0.16rem;
+
+  span {
+    color: #f5222d;
+  }
+
+  .text {
+    font-size: 0.14rem;
+    width: 0.6rem;
+    display: inline-block;
+    color: #000;
+  }
+
+  del {
+    color: #b5b5b5;
+
+    &.text {
+      color: #b5b5b5;
+    }
+  }
+
+  .btn-submit {
+    display: inline-block;
+    font-size: 0.18rem;
+    color: #fff;
+    background: #01c1b5;
+    border-radius: 1rem;
+    // box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.19);
+    padding: 0.08rem 0.36rem;
+  }
+}
+
+.pay-section {
+  margin: 0 0.15rem 0.1rem;
+}
+/deep/.pay-name {
+  padding-left: 0.1rem;
+  width: 70% !important;
+  font-weight: bold;
+  font-size: 0.14rem !important;
+}
+</style>

src/components/Mcoupon.vue

@@ -0,0 +1,228 @@
+<template>
+  <div v-if="showCoupon || showBalance" class="pay-wrap">
+    <van-cell-group class="pay-section">
+      <van-cell
+        title="优惠券"
+        is-link
+        @click="couponShow = true"
+        v-if="showCoupon"
+      >
+        <!-- 使用 right-icon 插槽来自定义右侧图标 -->
+        <template #title>
+          <span class="coupon-title">优惠券</span>
+        </template>
+        <template #default>
+          <div v-if="checkCouponList.length == 0">{{ coupon }}</div>
+          <div v-else>
+            <span style="color: #ff4444"
+              >- ¥ {{ faceValue | moneyFormat }}元</span
+            >
+          </div>
+        </template>
+      </van-cell>
+      <van-cell
+        v-if="showBalance"
+        :disabled="false"
+        @click="onClickCheckbox"
+        :border="false"
+        title="余额支付"
+        title-class="pay-name"
+        value-class="pay-value"
+        :center="true"
+      >
+        <template slot="icon">
+          <img class="logo" :src="iconSrcUrl" alt="" />
+        </template>
+        <template slot="title">
+          余额（剩余：￥{{ balance | moneyFormat }}）
+        </template>
+        <template slot="default">
+          <van-checkbox v-model="payType" checked-color="#2dc7aa">
+            <template #icon="props" v-if="activeIcon && inactiveIcon">
+              <img
+                class="checkbox_img"
+                :src="props.checked ? activeIcon : inactiveIcon"
+              />
+            </template>
+          </van-checkbox>
+        </template>
+      </van-cell>
+    </van-cell-group>
+    <!-- 优惠券弹窗 -->
+    <van-popup
+      v-model="couponShow"
+      position="bottom"
+      :close-on-click-overlay="true"
+      round
+      :lazy-render="false"
+      :style="{ height: '350px' }"
+      get-container=".pay-wrap"
+    >
+      <div class="couponList">
+        <h3 class="title">选择优惠券</h3>
+        <list
+          class="list"
+          :status="0"
+          :isEdit="true"
+          :buyList="buyList"
+          :all="true"
+          :studentId="studentIds"
+          @resetTitle="resetTitle"
+          ref="list"
+        />
+        <div style="padding: 0.25rem 0.26rem 0.05rem">
+          <van-button type="info" block size="large" round @click="sumitCoupon"
+            >确认</van-button
+          >
+        </div>
+      </div>
+    </van-popup>
+  </div>
+</template>
+<script>
+import list from "@/views/coupon/list.vue";
+export default {
+  components: { list },
+  props: [
+    "showBalance",
+    "showCoupon",
+    "balance",
+    "payType",
+    "buyList",
+    "studentId",
+    "iconSrc",
+    "activeIcon",
+    "inactiveIcon",
+  ],
+  data() {
+    return {
+      couponShow: false,
+      coupon: "",
+      checkCouponList: [],
+      faceValue: 0,
+      dataList: [],
+    };
+  },
+  mounted() {
+    this.getCouponList();
+  },
+  methods: {
+    getCouponList(page) {
+      if (this.$refs.list) {
+        this.resetCoupon();
+        this.$refs.list.FetchList(page);
+      }
+    },
+    onClickCheckbox() {
+      this.$emit("onClickCheckbox");
+    },
+    resetTitle(title) {
+      this.coupon = title;
+    },
+    sumitCoupon(val) {
+      this.checkCouponList = this.$refs.list.checkCouponList;
+
+      this.faceValue = this.$refs.list.faceValue;
+
+      this.$emit("setCoupon", {
+        couponList: [...this.checkCouponList],
+        valuePirce: this.faceValue,
+        dataList: this.$refs.list.dataList,
+      });
+
+      this.couponShow = false;
+    },
+    closeCoupon(val) {
+      console.log(val);
+    },
+    resetCoupon() {
+      this.checkCouponList = [];
+      this.$refs.list.checkCouponList = [];
+      this.$refs.list.faceValue = 0;
+      this.faceValue = 0;
+    },
+  },
+  computed: {
+    studentIds() {
+      return this.studentId;
+    },
+    iconSrcUrl() {
+      if (this.iconSrc) {
+        return this.iconSrc;
+      } else {
+        return require("@/assets/images/balance.png");
+      }
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.coupon-title {
+  font-size: 0.15rem;
+}
+/depp/.van-popup__close-icon {
+  position: fixed !important;
+}
+/deep/.van-popup--bottom.van-popup--round {
+  border-radius: 0.08rem 0.08rem 0 0;
+}
+.pay-section {
+  margin: 0 0.12rem 0.1rem;
+  // margin-bottom: 0.1rem;
+  padding: 0.05rem 0rem;
+  border-radius: 0.1rem;
+  /deep/.van-cell {
+    padding: 0.1rem 0.12rem;
+  }
+
+  .van-cell__value {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+.pay-name {
+  padding-left: 0.1rem;
+  flex: 1 auto;
+  font-weight: bold;
+  font-size: 0.14rem !important;
+}
+.pay-value {
+  width: 0.2rem !important;
+}
+
+.logo {
+  width: 0.24rem;
+  height: 0.24rem;
+}
+.couponList {
+  min-height: 350px;
+  background-color: rgb(245, 245, 245);
+}
+.list {
+  height: 220px;
+  overflow-y: scroll;
+}
+
+.title {
+  font-size: 0.16rem;
+  line-height: 0.28rem;
+  font-weight: 400;
+  color: #333333;
+  padding: 0.1rem 0.16rem 0;
+  &::before {
+    content: " ";
+    width: 0.04rem;
+    height: 0.15rem;
+    background: #01c1b5;
+    display: inline-block;
+    margin-right: 0.07rem;
+    border-radius: 8px;
+    position: relative;
+    top: 0.01rem;
+  }
+}
+.checkbox_img {
+  width: 0.18rem;
+  height: 0.18rem;
+}
+</style>

src/components/Protocol.vue

@@ -0,0 +1,252 @@
+<template>
+	<div class="protocol">
+		<div class="agreeProtocol" v-show="isProtocol">
+			<slot>
+				<van-checkbox @click="onChange" :checked-color="checkedColor" v-model="checked" v-if="!exists">
+					<template #icon="props">
+						<!-- {{ props.checked }} -->
+						<img :src="props.checked ? activeButtonIcon : inactiveButtonIcon" >
+					</template>
+				</van-checkbox>
+				<i :style="leftStyle" @click="onClick" v-if="!exists">{{ leftString }}</i>
+				<i :style="leftStyle" v-if="exists">查看</i>
+				<span @click="onPopupClose" :style="rightStyle">《{{ rightString }}》</span>
+			</slot>
+		</div>
+
+		<!-- 协议 -->
+		<van-popup id="protocolPopup" v-model="popupStatus" position="bottom">
+			<m-protocol :protocolHTML="protocolHTML" :popupStatus="popupStatus" :checked="checked" :tenantId="tenantId" @onClose="onPopupClose" @onPopupSure="onPopupSure" />
+		</van-popup>
+	</div>
+</template>
+
+<script>
+	import MProtocol from './MProtocol'
+	import {
+		queryProduceContract,
+		getContract
+	} from '@/api/smallWeb'
+	// import setLoading from '@/utils/loading'
+	export default {
+		name: 'mheader',
+		components: {
+			MProtocol
+		},
+		props: {
+			value: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			tenantId: [String, Number], // 机构签署协议
+			type: {
+				type: [String, Number],
+				default: 0
+			},
+			musicGroupId: String,
+			checkedColor: String,
+			userId: String,
+			activeIcon: String,
+			inactiveIcon: String,
+			leftStyle: String,
+			leftString: {
+				type: String,
+				default () {
+					return '我已阅读并同意'
+				}
+			},
+			rightStyle: String,
+			rightString: {
+				type: String,
+				default () {
+					return '产品及服务协议'
+				}
+			}
+		},
+		data() {
+			return {
+				popupStatus: false,
+				checked: this.value,
+				exists: true, // 是否已经生成过协议
+				protocolHTML: null, // 协议内容
+				fullPath: null, //保存
+				isProtocol: false // 是否有协议内容
+			}
+		},
+		mounted() {
+			this.__init()
+			// window.onhashchange = () => {
+			// 	this.popupStatus = false
+			// }
+			window.addEventListener('hashchange', this.onHash, false)
+		},
+		methods: {
+			onHash() {
+				this.popupStatus = false
+			},
+			async __init() {
+				if(this.tenantId) {
+					try {
+						const res = await getContract({ id: this.tenantId, type: this.type })
+						this.protocolHTML = res.data
+						this.isProtocol = this.protocolHTML ? true : false
+						this.exists = false
+						this.checked = false
+						this.$emit('input', this.exists)
+					} catch(e) {
+						//
+					}
+				} else {
+					let params = {
+						userId: this.userId ? this.userId : null,
+						musicGroupId: this.musicGroupId ? this.musicGroupId : null
+					}
+					const token = sessionStorage.getItem('token')
+					if(token) {
+						localStorage.setItem('Authorization', token)
+						localStorage.setItem('userInfo', token)
+					}
+
+					await queryProduceContract(params).then(res => {
+						let result = res.data
+						this.protocolHTML = '' // 重置协议
+						if (result.code == 200) {
+							this.protocolHTML = result.data.productContract
+							this.isProtocol = this.protocolHTML ? true : false
+							this.exists = result.data.exists
+							this.checked = this.exists
+							this.$emit('input', this.exists)
+						}
+					})
+				}
+				// 如果没有协议内容则不 显示协议
+				if(!this.protocolHTML) {
+					this.isProtocol = this.protocolHTML ? true : false
+					this.checked = true // 默认选中，学生端则不用默认选中
+					this.$emit('input', this.checked || this.exists)
+				}
+			},
+			// onChange() {
+			// 	this.$emit('input', this.checked)
+			// },
+			// onClick() {
+			// 	this.checked = !this.checked
+			// 	this.$emit('input', this.checked)
+			// },
+			onChange() {
+				if(this.tenantId) {
+					if(this.checked) {
+						this.checked = false
+						this.onPopupClose()
+					} else {
+						this.$emit('input', false)
+					}
+				} else {
+					this.$emit('input', this.checked)
+				}
+			},
+			onClick() {
+				if(this.tenantId) {
+					if(this.checked) {
+						this.checked = false
+						this.$emit('input', false)
+					} else {
+						this.onPopupClose()
+					}
+				} else {
+					this.checked = !this.checked
+					this.$emit('input', this.checked)
+				}
+			},
+			onPopupSure() {
+				this.$emit('input', true)
+				this.checked = true
+				this.onPopupClose()
+			},
+			onPopupClose() {
+				// 判断是否有协议内容
+				if(!this.protocolHTML) {
+					return
+				}
+				this.popupStatus = !this.popupStatus
+				// 打开弹窗
+				if(this.popupStatus) {
+					const route = this.$route
+					let times = 0
+					/* eslint-disable */
+					for(let i in route.query) {
+						times += 1
+					}
+					let fullPath = route.fullPath
+					const origin = window.location.origin
+					const url = times > 0 ? '&pto=1' : '?pto=1'
+					history.pushState("", "", `${origin}/#${fullPath}${url}`)
+				} else {
+					window.history.go(-1)
+				}
+				let popup = document.querySelector('#protocolPopup')
+				if (popup) {
+					popup.scrollTop = 0
+				}
+			}
+		},
+		watch: {
+			popupStatus(newValue) {
+				this.$emit('changeCheck', newValue)
+			},
+			value(nowValue) {
+				if (nowValue) {
+					this.checked = nowValue
+				}
+			}
+		},
+		destroyed() {
+			window.removeEventListener('hashchange', this.onHash)
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.agreeProtocol {
+		display: flex;
+		align-items: center;
+		color: #333333;
+		padding: .1rem .16rem;
+		font-size: .14rem;
+		line-height: 1;
+		i {
+			font-style: normal;
+		}
+		.van-checkbox {
+			padding-right: .08rem;
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+
+		/deep/.van-checkbox__icon .van-icon {
+			border-color: #e9eaef;
+			background-color: #fff;
+		}
+
+		/deep/.van-checkbox__icon--checked .van-icon {
+			color: #fff;
+			background-color: #F85043;
+			border-color: #F85043;
+		}
+
+		span {
+			color: #01C1B5;
+		}
+	}
+
+	@media screen and (max-width: 320px) {
+		.agreeProtocol .van-checkbox img {
+			width: 20px;
+			height: 20px;
+		}
+	}
+</style>

src/main.js

@@ -51,6 +51,7 @@ import {
   Calendar,
   Empty,
   Uploader,
+  Stepper,
 } from "vant";
 Vue.use(Button)
   .use(Icon)
@@ -97,7 +98,8 @@ Vue.use(Button)
   .use(GridItem)
   .use(Calendar)
   .use(Empty)
-  .use(Uploader);
+  .use(Uploader)
+  .use(Stepper);
 
 Vue.config.productionTip = false;
 

src/router/index.js

@@ -3,6 +3,7 @@ import Router from "vue-router";
 import TeacherRouter from "./teacherRouter";
 import AppRouter from "./appRouter";
 import AuditionRouter from "./auditionRouter";
+import ServiceRouter from "./serviceRouter";
 
 Vue.use(Router);
 
@@ -127,24 +128,25 @@ let defaultRouter = [
       weight: 2,
     },
   },
-  {
-    path: "/serviceStudent",
-    name: "serviceStudent",
-    component: () =>
-      import(
-        /* webpackChunkName:'serviceStudent' */ "@/views/serviceStudent/index"
-      ),
-    meta: {
-      descrition: "商品销售",
-      weight: 2,
-    },
-  },
+  // {
+  //   path: "/serviceStudent",
+  //   name: "serviceStudent",
+  //   component: () =>
+  //     import(
+  //       /* webpackChunkName:'serviceStudent' */ "@/views/serviceStudent/index"
+  //     ),
+  //   meta: {
+  //     descrition: "商品销售",
+  //     weight: 2,
+  //   },
+  // },
 ];
 
 defaultRouter = defaultRouter
   .concat(TeacherRouter)
   .concat(AppRouter)
-  .concat(AuditionRouter);
+  .concat(AuditionRouter)
+  .concat(ServiceRouter);
 
 const router = new Router({
   // mode: 'history',

src/router/serviceRouter.js

@@ -0,0 +1,98 @@
+let serviceRouter = [
+  {
+    path: "/serviceStudent",
+    name: "serviceStudent",
+    component: () =>
+      import(
+        /* webpackChunkName:'AssignStudent'*/ "@/views/service/ServiceStudent.vue"
+      ),
+    meta: {
+      descrition: "学员选择",
+      weight: 2,
+    },
+  },
+  {
+    path: "/serviceList",
+    name: "serviceList",
+    component: () =>
+      import(
+        /* webpackChunkName:'AssignStudent'*/ "@/views/service/ServiceList.vue"
+      ),
+    meta: {
+      descrition: "乐团列表",
+      weight: 2,
+    },
+  },
+  {
+    path: "/teamStudentList",
+    name: "TeamStudentList",
+    component: () =>
+      import(
+        /* webpackChunkName:'AssignStudent'*/ "@/views/service/TeamStudentList.vue"
+      ),
+    meta: {
+      descrition: "学员列表",
+      weight: 2,
+    },
+  },
+  {
+    path: "/studentLeBao",
+    name: "studentLeBao",
+    component: () =>
+      import(
+        /* webpackChunkName:'AssignStudent'*/ "@/views/service/studentLeBao.vue"
+      ),
+    meta: {
+      descrition: "学员乐器列表",
+      weight: 2,
+    },
+  },
+  {
+    path: "/studentRepaireRecord",
+    name: "studentRepaireRecord",
+    component: () =>
+      import(
+        /* webpackChunkName:'StudentRepaireRecord'*/ "@/views/service/StudentRepaireRecord.vue"
+      ),
+    meta: {
+      descrition: "学生维修列表",
+      weight: 2,
+    },
+  },
+  {
+    path: "/goodsSale",
+    name: "goodsSale",
+    component: () =>
+      import(/* webpackChunkName:'GoodsSale'*/ "@/views/service/GoodsSale.vue"),
+    meta: {
+      descrition: "商品销售",
+      weight: 2,
+    },
+  },
+  {
+    path: "/goodsOrder",
+    name: "goodsOrder",
+    component: () =>
+      import(
+        /* webpackChunkName:'GoodsOrder'*/ "@/views/service/GoodsOrder.vue"
+      ),
+    meta: {
+      descrition: "商品订单",
+      weight: 2,
+    },
+  },
+  {
+    path: "/goodsOrderDetail",
+    name: "goodsOrderDetail",
+    component: () =>
+      import(
+        /* webpackChunkName:'GoodsOrderDetail'*/ "@/views/service/GoodsOrderDetail.vue"
+      ),
+    meta: {
+      descrition: "订单详情",
+      weight: 2,
+    },
+  },
+];
+
+export default serviceRouter;

src/utils/validate.js

@@ -1,38 +1,37 @@
-
 // 身份证号验证
 export function checkIDCard(idCardNo) {
-    let result = true
-    //
-    let idCardReg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
-    if(idCardReg.test(idCardNo) === false){
-        result = false
-    }
-    return result
+  let result = true;
+  //
+  let idCardReg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+  if (idCardReg.test(idCardNo) === false) {
+    result = false;
+  }
+  return result;
 }
 
 // 港澳居民来往内地通行证（回乡证）
 export function checkPassport(idCardNo) {
-    // 港澳居民来往内地通行证
-    // 规则： H/M + 10位或6位数字
-    // 样本： H1234567890
-    let result = true
-    // let idReg = /^[mMhH]\\d{10}|[mMhH]\\d{8}$/
-    let idReg = /^([A-Z]\d{6,10}(\(\w{1}\))?)$/
-    if(idReg.test(idCardNo) === false) {
-        result = false
-    }
-    return result
+  // 港澳居民来往内地通行证
+  // 规则： H/M + 10位或6位数字
+  // 样本： H1234567890
+  let result = true;
+  // let idReg = /^[mMhH]\\d{10}|[mMhH]\\d{8}$/
+  let idReg = /^([A-Z]\d{6,10}(\(\w{1}\))?)$/;
+  if (idReg.test(idCardNo) === false) {
+    result = false;
+  }
+  return result;
 }
 
 // 台湾居民来往大陆通行证（台胞证）
 export function checkPassportTaiwan(idCardNo) {
-    // 台湾居民来往大陆通行证
-    // 规则： 新版8位或18位数字， 旧版10位数字 + 英文字母
-    // 样本： 12345678 或 1234567890B
-    let result = true
-    let idReg = /(^\\d{8}$)|(^[a-zA-Z0-9]{10}$)|(^\\d{18}$)/
-    if(idReg.test(idCardNo) === false) {
-        result = false
-    }
-    return result
-}
+  // 台湾居民来往大陆通行证
+  // 规则： 新版8位或18位数字， 旧版10位数字 + 英文字母
+  // 样本： 12345678 或 1234567890B
+  let result = true;
+  let idReg = /(^\\d{8}$)|(^[a-zA-Z0-9]{10}$)|(^\\d{18}$)/;
+  if (idReg.test(idCardNo) === false) {
+    result = false;
+  }
+  return result;
+}

src/views/app/PaymentResult.vue

@@ -24,8 +24,7 @@
       <div class="status">
         <img src="@/assets/images/pay_success.png" alt />
         <p>支付成功</p>
-        <p class="money" v-if="groupType == 'PRACTICE'">￥{{ PRACTICEPRICE }}</p>
-        <p class="money" v-else>￥{{ orderInfo.actualAmount }}</p>
+        <p class="money">￥{{ orderInfo.price | moneyFormat }}</p>
       </div>
       <div class="orderinfo">
         <p>
@@ -36,15 +35,17 @@
           <span>订单号：</span>
           {{ orderInfo.orderNo }}
         </p>
-        <p>
-          <!-- 订单内容：购买的小时数， -->
+        <div v-if="goodsInfo.length > 0">
           <span>购买详情：</span>
-          <span>购买：{{ orderInfo.transMinutes | calcMinute }}；</span>
-          <span
-            v-if="orderInfo.giveMinutes && orderInfo.giveMinutes > 0"
-          >赠送：{{ orderInfo.giveMinutes | calcMinute }}；</span>
-        </p>
-        <!-- <img class="icon_img" v-if="!ownershipType" src="@/assets/images/icon_cw.png" alt srcset /> -->
+          <p v-for="(item, index) in goodsInfo" :key="index">{{ item }}</p>
+        </div>
+        <img
+          class="icon_img"
+          v-if="!financeChops"
+          src="@/assets/images/icon_cw.png"
+          alt
+          srcset
+        />
       </div>
       <van-button type="info" @click="onAppBack" round>返回</van-button>
     </div>
@@ -55,7 +56,7 @@
 /* eslint-disable */
 import MHeader from "@/components/MHeader";
 import { browser, validStudentUrl } from "@/common/common";
-import { queryByOrderNoAuth } from "@/api/app";
+import { queryByOrderNoAuth, queryOrderInfo } from "@/api/app";
 
 export default {
   name: "paymentresult",
@@ -69,7 +70,8 @@ export default {
       orderInfo: {}, // 订单基本信息
       smsText: 60,
       groupType: null, //订单类型
-      timer: null
+      timer: null,
+      financeChops: null,
     };
   },
   mounted() {
@@ -77,10 +79,10 @@ export default {
       this.headerStatus = true;
     }
     this.__init();
-    this.pushHistory();
+    // this.pushHistory();
     window.addEventListener(
       "popstate",
-      function(e) {
+      function (e) {
         if (browser().android) {
           DAYA.postMessage(JSON.stringify({ api: "back" }));
         } else if (browser().iPhone) {
@@ -88,8 +90,7 @@ export default {
             JSON.stringify({ api: "back" })
           );
         } else {
-          window.location.replace(
-          validStudentUrl() + "/#/teacherDownload")
+          window.location.replace(validStudentUrl() + "/#/teacherDownload");
         }
       },
       false
@@ -99,7 +100,7 @@ export default {
     pushHistory() {
       var state = {
         title: "title",
-        url: "#"
+        url: "#",
       };
       window.history.pushState(state, "title", "#");
     },
@@ -108,12 +109,19 @@ export default {
       // 支付成功
       if (params.orderNo) {
         // 是否有订单号
-        queryByOrderNoAuth({ orderNo: params.orderNo }).then(res => {
+        queryOrderInfo({ orderNo: params.orderNo }).then((res) => {
           let result = res.data;
           if (result.code == 200) {
-            let tempResult = result.data;
+            let tempResult = result.data ? result.data : {};
+            // 判断是否有值
             this.orderInfo = tempResult;
+            this.groupType = tempResult.type;
+            this.financeChops = tempResult.financeChops || null;
             this.showStatus(tempResult.status);
+            if (tempResult.type == "GOODS_SELL") {
+              // 商品销售
+              this.getGoodsInfo(tempResult.detail);
+            }
           } else {
             // 订单处理中
             this.pageStatus = "paying";
@@ -129,27 +137,12 @@ export default {
         }
       }
     },
-    getYMDToCn(date) {
-      if (typeof date == "string") {
-        date = date.replace(/-/gi, "/");
-      }
-      let tempDate = new Date(date);
-      return (
-        tempDate.getFullYear() +
-        "年" +
-        (tempDate.getMonth() + 1) +
-        "月" +
-        tempDate.getDate() +
-        "日"
-      );
-    },
-    splitStr(str) {
-      if (str) {
-        let s = str.split(":");
-        return s[0] + ":" + s[1];
-      } else {
-        return str;
-      }
+    getGoodsInfo(item) {
+      let goodsJson = item.goodsJson ? JSON.parse(item.goodsJson) : [];
+      this.goodsInfo = [];
+      goodsJson.forEach((goods) => {
+        this.goodsInfo.push(goods.goodsName + " ×" + goods.goodsNum);
+      });
     },
     showStatus(status, type) {
       if (status == "ING") {
@@ -173,8 +166,7 @@ export default {
           window.history.go(-(historyLength - 2));
         }
       } else {
-        window.location.replace(
-          validStudentUrl() + "/#/teacherDownload")
+        window.location.replace(validStudentUrl() + "/#/teacherDownload");
       }
 
       // if (browser().android) {
@@ -197,8 +189,8 @@ export default {
           this.smsText = s;
         }
       }, 1000);
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -285,12 +277,16 @@ export default {
       color: #444444;
     }
     .icon_img {
+      // width: 1.2rem;
+      // height: 1.1rem;
+      // position: absolute;
+      // bottom: 0.3rem;
+      // right: 0.2rem;
       width: 1.2rem;
-      height: 1.1rem;
       position: absolute;
-      bottom: 0.3rem;
-      right: 0.2rem;
+      top: 0.8rem;
+      right: 0.15rem;
     }
   }
 }
-</style>
+</style>

src/views/coupon/api.js

@@ -0,0 +1,9 @@
+import request from '@/helpers/request'
+
+export const sysCouponCode = (data) => {
+  return request({
+      url: '/eduSysCouponCode/queryPage',
+      method: 'get',
+      params: data
+  })
+}

src/views/coupon/index.vue

@@ -0,0 +1,71 @@
+<template>
+  <van-tabs class="tabs" v-model="active" sticky lazy-render color="#01C1B5">
+    <van-tab title="可使用">
+      <coupon-list @setDot="setDot" ref="uselist" v-if="active === 0" key="0" :status="0"/>
+    </van-tab>
+    <van-tab title="已使用">
+      <coupon-list v-if="active === 1" key="1" :status="1"/>
+    </van-tab>
+    <van-tab title="已失效">
+      <coupon-list v-if="active === 2" key="2" :status="2"/>
+    </van-tab>
+  </van-tabs>
+</template>
+
+<script>
+import list from './list.vue'
+export default {
+  components: {
+    'coupon-list': list
+  },
+  data() {
+    return {
+      active: '',
+      hasDot: false,
+    }
+  },
+  mounted() {
+    document.title = '优惠券'
+  },
+  methods: {
+    setDot(has) {
+      this.hasDot = has
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+  .tabs{
+    // background-color: #fff;
+    padding-bottom: .15rem;
+    /deep/.van-tabs__wrap{
+      height: .58rem!important;
+    }
+    /deep/.van-tab {
+      height: .58rem;
+      line-height: .58rem;
+      &__text{
+        color: #808080;
+        font-size: .15rem;
+        position: relative;
+        .van-info--dot{
+          display: inline-block;
+          right: -.06rem;
+          position: absolute;
+          top: .01rem;
+          background-color: #F85043;
+        }
+      }
+    }
+    /deep/.van-tabs__content{
+      padding-top: .15rem;
+      min-height: calc(100vh - .58rem);
+    }
+    /deep/.van-tab--active{
+      .van-tab__text{
+        color: #000;
+      }
+    }
+  }
+</style>

src/views/coupon/item.vue

@@ -0,0 +1,410 @@
+<template>
+  <div
+    class="coupon"
+    :class="{
+      used: detail.usageStatus == 1,
+      exp: detail.usageStatus == 2,
+      disable: isEdit ? isDisabled : '',
+    }"
+    v-if="detail"
+    @click="checkItem(detail)"
+  >
+    <span class="sdot" v-if="detail.issuanceType == 0"
+      >{{ detail.canBeGetNum }} <span class="text">张</span></span
+    >
+    <!-- 
+    <span class="edot"></span> -->
+    <div class="couponWrap">
+      <div class="couponPrice">
+        <img
+        v-if="isDisabled"
+          class="couponIcon couponIcon1"
+          :src="isEdit||(detail.usageStatus == 2||detail.usageStatus == 1)? dis_img : img"
+          alt=""
+        />
+          <img
+          v-else
+          class="couponIcon"
+          :src="!isEdit? dis_img : img"
+          alt=""
+        />
+
+        <div class="descWrap">
+          <!--  detail.couponName || detail.name  -->
+          <div class="title">{{detail.typeDetail | coupontypeDetailType}}</div>
+          <div class="desc">
+            <!-- <span>{{ detail.typeDetail | coupontypeDetailType }}</span> -->
+            <span>满{{ detail.fullAmount }}</span
+            ><span>减{{ detail.faceValue }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="time" v-if="detail.issuanceType != 0">
+        有效期: {{ dayjs(detail.useStartDate).format("YYYY.MM.DD") }} 至
+        {{ dayjs(detail.useDeadlineDate).format("YYYY.MM.DD") }}
+      </div>
+      <div
+        class="time"
+        v-if="detail.issuanceType == 0 && detail.effectiveType == 'DAYS'"
+      >
+        自领取
+        <span style="color: #ff761a">{{ detail.deadline }}</span> 日内有效
+      </div>
+      <div
+        class="time"
+        v-if="detail.issuanceType == 0 && detail.effectiveType == 'TIME_BUCKET'"
+      >
+        有效期: {{ dayjs(detail.effectiveStartTime).format("YYYY.MM.DD") }} 至
+        {{ dayjs(detail.effectiveExpireTime).format("YYYY.MM.DD") }}
+      </div>
+    </div>
+    <div class="line">
+      <img src="./icons/line.png" alt="" />
+    </div>
+    <div class="detail van-hairline--left">
+      <!-- couponCodeId -->
+      <div class="amount">{{ detail.faceValue }}</div>
+      <van-checkbox
+        :name="detail.couponCodeId"
+        :disabled="isDisabled"
+        v-if="isEdit && !isDisabled && detail.issuanceType != 0"
+        class="checkItem"
+        ref="checkItem"
+      ></van-checkbox>
+      <div class="expgetBtn getBtn" v-if="!isEdit && detail.usageStatus == 2">
+        已失效
+      </div>
+      <div class="usedgetBtn getBtn" v-if="!isEdit && detail.usageStatus == 1">
+        已使用
+      </div>
+      <div
+        class="getBtn"
+        v-if="isEdit && detail.issuanceType == 0"
+        @click="getCoupon(detail)"
+      >
+        领取
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import dayjs from "dayjs";
+import { manualIssueCoupon } from "./api";
+export default {
+  props: {
+    detail: {
+      type: Object,
+      default: null,
+    },
+    isEdit: {
+      type: Boolean,
+      default: false,
+    },
+    isDisabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      img: require("./icons/bg.png"),
+      dis_img: require("./icons/dis_bg.png"),
+    };
+  },
+  methods: {
+    dayjs,
+    checkItem(detail) {
+      if (!this.isDisabled) this.$refs.checkItem.onClick(detail);
+    },
+    async getCoupon(detail) {
+      try {
+        const res = await manualIssueCoupon({ couponId: detail.id });
+        this.$toast({
+          message: "领取成功",
+          forbidClick: true,
+          // onOpened
+          onClose: () => {
+            this.$emit("getList");
+          },
+        });
+      } catch (e) {
+        this.$emit("getList");
+        console.log(e);
+      }
+    },
+  },
+  computed: {
+    isdisabled() {
+      return this.isDisabled;
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+.coupon.used {
+  .couponPrice {
+    // &::before {
+    //   background: url("./icons/used.png") no-repeat center;
+    //   width: 0.43rem;
+    //   height: 0.43rem;
+    //   top: 0.1rem;
+    //   right: 0.16rem;
+    //   content: "";
+    //   background-size: cover !important;
+    //   position: absolute;
+    // }
+  }
+  .getBtn {
+    height: 0.24rem;
+    line-height: 0.24rem;
+    background: rgba(245, 245, 245, 0.5);
+    border-radius: 6px;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    font-size: 0.12rem;
+    background: linear-gradient(270deg, #ebebeb 0%, #d0d0d0 100%);
+    border-radius: 0.12rem;
+    color: #fff;
+    font-weight: bold;
+    text-align: center;
+    border: none;
+  }
+}
+.coupon.exp {
+  .couponPrice {
+    // &::before {
+    //   background: url("./icons/exp.png") no-repeat center;
+    //   width: 0.43rem;
+    //   height: 0.43rem;
+    //   top: 0.1rem;
+    //   right: 0.16rem;
+    //   content: "";
+    //   background-size: cover !important;
+    //   position: absolute;
+    // }
+  }
+  .getBtn {
+    height: 0.24rem;
+    line-height: 0.24rem;
+    background: rgba(245, 245, 245, 0.5);
+    border-radius: 6px;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    font-size: 0.12rem;
+    background: linear-gradient(270deg, #ebebeb 0%, #d0d0d0 100%);
+    border-radius: 0.12rem;
+    color: #fff;
+    font-weight: bold;
+    text-align: center;
+    border: none;
+  }
+}
+.disable.coupon,
+.coupon.used,
+.coupon.exp {
+  // 禁选状态
+  // background: url("./icons/dis_bg.png") no-repeat center;
+  background-size: contain;
+  background-color: #fff;
+  width: 3.5rem;
+  height: 1.06rem;
+
+  .time {
+    font-size: 0.1rem;
+    color: rgba(0, 0, 0, 0.25) !important;
+    max-width: 2rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    line-height: 1;
+  }
+  .couponPrice {
+    .amount {
+      color: rgba(0, 0, 0, 0.25);
+      &::before {
+        content: "¥";
+        display: inline-block;
+        font-weight: normal;
+        color: rgba(0, 0, 0, 0.25);
+      }
+    }
+    .descWrap {
+      .title {
+        color: rgba(0, 0, 0, 0.25);
+        font-weight: 500;
+        // font-weight: bold;
+      }
+      .desc {
+        // margin: 0.08rem 0;
+        display: flex;
+        align-items: center;
+        span {
+          font-size: 0.13rem;
+          color: rgba(0, 0, 0, 0.25);
+          // padding: 0 0.02rem;
+          display: inline-block;
+
+          // line-height: 1.2;
+        }
+      }
+    }
+  }
+  .detail {
+    .amount {
+      position: relative;
+      text-align: center;
+      color: #adadad;
+      font-size: 0.28rem;
+      font-weight: bold;
+      &::before {
+        content: "¥";
+        display: inline-block;
+        font-weight: normal;
+        font-size: 0.14rem;
+        margin-right: 0.04rem;
+        margin-top: 0.02rem;
+        color: #adadad;
+      }
+    }
+  }
+}
+.coupon {
+  // background: url("./icons/bg.png") no-repeat center;
+  background-color: #fff;
+  background-size: contain;
+  width: 3.5rem;
+  height: 1.06rem;
+  margin: auto;
+  margin-top: 0.15rem;
+  border-radius: 0.05rem;
+  // overflow: hidden;
+  // border: 1px solid #FFDCDC;
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  .line {
+     height: 90%;
+     overflow: hidden;
+    img {
+      width: 1px;
+     
+    }
+  }
+  .couponWrap {
+    padding: 0.2rem 0 0.14rem 0.2rem;
+    .time {
+      margin-top: 0.14rem;
+      font-size: 0.12rem;
+      color: #6d7278;
+      max-width: 2.4rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      line-height: 0.17rem;
+    }
+    .couponPrice {
+      .couponIcon {
+        width: 0.49rem;
+        height: 0.49rem;
+      }
+      // height: 0.62rem;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+    .descWrap {
+      margin-left: 0.12rem;
+      width: 1.5rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      .title {
+        font-size: 0.14rem;
+        line-height: 0.2rem;
+        height: 0.2rem;
+        color: #1a1a1a;
+        font-weight: 600;
+        margin-bottom: 0.08rem;
+        // font-weight: bold;
+      }
+      .desc {
+        // margin: 0.08rem 0;
+        display: flex;
+        align-items: center;
+        span {
+          font-size: 0.13rem;
+          color: #6d7278;
+          padding: 0 0.02rem;
+          display: inline-block;
+          font-weight: 400;
+          line-height: 0.18rem;
+          // line-height: 1.2;
+        }
+      }
+    }
+  }
+  .getBtn {
+    margin: 0 auto;
+    width: 0.63rem;
+    height: 0.24rem;
+    line-height: 0.24rem;
+    background: linear-gradient(270deg, #fd9d00 0%, #ff761a 100%);
+    border-radius: 0.12rem;
+    font-size: 0.12rem;
+    color: #fff;
+    font-weight: bold;
+    text-align: center;
+  }
+  .detail {
+    // display: flex;
+    // flex-direction: column;
+    // justify-content: space-around;
+    // padding: 0 0.18rem;
+    width: 1.14rem;
+    position: relative;
+    .amount {
+      position: relative;
+      text-align: center;
+      color: #fa6400;
+      font-size: 0.28rem;
+      font-weight: bold;
+      &::before {
+        content: "¥";
+        display: inline-block;
+        font-weight: normal;
+        font-size: 0.14rem;
+        margin-right: 0.04rem;
+        margin-top: 0.02rem;
+        color: #fa6400;
+      }
+    }
+
+    // background: linear-gradient(to left, rgba(255, 160, 160, .1008) 0%, rgba(255,102,102, .14) 100%);
+
+    .checkItem {
+      margin: 0 auto;
+      justify-content: center;
+    }
+  }
+  .sdot {
+    background: linear-gradient(270deg, #fd9d00 0%, #ff761a 100%);
+    border-radius: 0px 8px 0px 8px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    padding: 0 0.07rem;
+    height: 0.2rem;
+    font-size: 0.12rem;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    line-height: 0.2rem;
+    color: #fff;
+    text-align: center;
+    .text {
+      font-size: 0.1rem;
+      line-height: 0.13rem;
+    }
+  }
+}
+</style>

src/views/coupon/list.vue

@@ -0,0 +1,301 @@
+<template>
+  <div :class="{ list: dataShow && !loading }">
+    <template v-if="dataShow">
+      <van-list
+        v-model="loading"
+        v-if="dataShow"
+        key="data"
+        :finished="finished"
+        :immediate-check="false"
+        finished-text="- 没有更多优惠券 -"
+        @load="FetchList"
+      >
+        <van-checkbox-group
+          v-model="checkCouponList"
+          @change="changeAll"
+          checked-color="#ff6464"
+        >
+          <coupon-item
+            v-for="item in dataList"
+            :key="item.code"
+            :detail="item"
+            :isDisabled="item.disabled"
+            :isEdit="isEdit"
+          />
+        </van-checkbox-group>
+      </van-list>
+    </template>
+    <m-empty v-if="!dataShow" key="teacher" msg="暂无优惠券" />
+  </div>
+</template>
+<script>
+const couponType = [
+  "OTHER",
+  "MUSICAL",
+  "ACCESSORIES",
+  "MAINTENANCE",
+  "TEACHING",
+  "PRACTICE",
+  "SINGLE",
+  "MIX",
+  "VIP",
+  "MEMBER",
+  "FULLCOUPON",
+];
+import MEmpty from "@/components/MEmpty";
+import item from "./item";
+import { sysCouponCode } from "./api";
+import { isDuringDate } from "@/helpers/utils";
+export default {
+  props: ["status", "isEdit", "allMoney", "all", "buyList"],
+  components: {
+    MEmpty,
+    "coupon-item": item,
+  },
+  data() {
+    return {
+      couponType,
+      loading: false,
+      finished: false,
+      dataShow: true,
+      dataList: [],
+      params: {
+        page: 1,
+        usageStatus: this.status,
+        rows: this.all ? 9999 : 10,
+      },
+      checkCouponList: [],
+      faceValue: 0,
+    };
+  },
+  mounted() {
+    this.FetchList();
+    // console.log('调用123')
+    // console.log(isDuringDate('2021-11-01 00:00:00','2022-10-31 23:59:59'))
+  },
+  methods: {
+    async FetchList(page) {
+      if (page) {
+        this.dataList = [];
+        this.params.page = page;
+      }
+      try {
+        this.loading = true;
+        this.params.userId = this.$route.query.studentId;
+        let res = await sysCouponCode(this.params);
+        let result = res.data;
+        if (this.dataList.length > 0 && result.pageNo == 1) {
+          return;
+        }
+        this.dataList = this.dataList.concat(result.rows);
+        if (this.params.page >= result.totalPage) {
+          this.finished = true;
+        }
+        this.params.page++;
+        // 判断是否有数据
+        if (this.dataList.length <= 0) {
+          this.dataShow = false;
+        } else {
+          this.dataShow = true;
+        }
+
+        // this.$emit("setDot", this.dataList.length > 0);
+        // eslint-disable-next-line no-empty
+      } catch (error) {
+        this.dataShow = false;
+        this.finished = true;
+      }
+      this.loading = false;
+      this.$nextTick(() => {
+        this.setTitle(this.allMoney);
+      });
+      this.$nextTick(() => {
+        this.setTitle(this.allMoney);
+      });
+    },
+    changeAll(val) {
+      // console.log(val, 'changeAll')
+      this.setListDisabled(val);
+    },
+    setListDisabled(list) {
+      // 算优惠券了 list 已选中的优惠券
+      // dataList 所有的优惠券
+      let shopObj = {}; // 每种类型的商品对应的价格
+
+      let fullAmountList = {};
+      let faceValueList = {};
+      let shopType = []; // 所以类型的商品
+      this.buyList.forEach((item) => {
+        if (shopObj[item.couponType]) {
+          shopObj[item.couponType] += Number(item.price);
+        } else {
+          shopObj[item.couponType] = Number(item.price);
+          fullAmountList[item.couponType] = 0;
+          faceValueList[item.couponType] = 0;
+          shopType.push(item.couponType);
+        }
+      });
+      let nowMoneyList = { ...shopObj };
+      // shopType.push("FULLCOUPON");
+      // typeDetail
+
+      this.nowMoney = 0; // 满的钱
+      this.faceValue = 0; // 面值 减的钱
+      this.payMoney = this.allMoney * 1; // 减的总金额
+      // 过滤一遍优惠券
+      /**
+       *      if (shopType.indexOf(copon.typeDetail) == -1) {
+          copon.disabled = true;
+        }
+       * 
+       */
+      this.dataList.forEach((item) => {
+        if (list.indexOf(item.couponCodeId) != -1) {
+          // 这里是选过的卷 加到相对应的值里去
+          if (item.typeDetail != "FULLCOUPON") {
+            fullAmountList[item.typeDetail] += item.fullAmount;
+            faceValueList[item.typeDetail] += item.faceValue;
+            nowMoneyList[item.typeDetail] =
+            shopObj[item.typeDetail] - faceValueList[item.typeDetail];
+            // shopObj[item.typeDetail] -= item.faceValue;
+          } else {
+            // 全类卷
+            // 1.获取当前商品减优惠券的价格总值 allmoney
+            // 2.获取当前 单个商品减优惠卷的价格 shopObj[i]
+            // 3.算出 单个价值总价格的百分比
+            // 4.将面值和见面金额分摊到每个商品上去
+            let temAllMoney = 0;
+            for (let i in shopType) {
+              // i 为所有的type
+              temAllMoney += shopObj[shopType[i]];
+            }
+
+            // 1.总价格拿到 temAllMoney
+            for (let i in shopType) {
+              // i 为所有的type
+              let sclac = Number(shopObj[shopType[i]] / temAllMoney);
+              faceValueList[shopType[i]] = Number(
+                faceValueList[shopType[i]] + sclac * Number(item.faceValue)
+              );
+              nowMoneyList[shopType[i]] = Number(
+                shopObj[shopType[i]] - faceValueList[shopType[i]]
+              );
+                  fullAmountList[shopType[i]] = Number(
+                fullAmountList[shopType[i]] + sclac * Number(item.fullAmount)
+              );
+            }
+            // console.log(temAllMoney,{...shopObj})
+          }
+
+          // this.nowMoney += item.fullAmount;
+          // this.payMoney -= item.faceValue;
+          // this.faceValue += item.faceValue;
+        }
+      });
+      // console.log("nowMoneyList:", nowMoneyList);
+      // console.log("faceValueList:", faceValueList);
+      // console.log("shopObj:", shopObj);
+      // console.log("fullAmountList:", fullAmountList);
+      // 选了一张
+      // this.dataList.forEach((item) => {
+      //   if (list.indexOf(item.couponCodeId) != -1) {
+      //     this.nowMoney += item.fullAmount;
+      //     // this.payMoney -= item.faceValue;
+      //     this.faceValue += item.faceValue;
+      //   }
+      // });
+      let allNowMoney = 0;
+      let allShopMoney = 0;
+      let allfaceValue = 0;
+      let allFullMoney = 0;
+      let flag = false;
+      for (let i in shopType) {
+        allNowMoney += nowMoneyList[shopType[i]];
+        allShopMoney += shopObj[shopType[i]];
+        allfaceValue += faceValueList[shopType[i]];
+        allFullMoney += fullAmountList[shopType[i]];
+      }
+
+      console.log(
+        "allNowMoney:",
+        allNowMoney,
+        "allShopMoney:",
+        allShopMoney,
+        "allfaceValue:",
+        allfaceValue,
+        'allFullMoney',
+        allFullMoney
+      );
+      this.faceValue = allfaceValue;
+      this.dataList.forEach((item) => {
+        if (
+          item.typeDetail != "FULLCOUPON" &&
+          shopObj[item.typeDetail] &&
+          item.fullAmount <=(shopObj[item.typeDetail]- fullAmountList[item.typeDetail]) &&
+          isDuringDate(item.useStartDate, item.useDeadlineDate)
+        ) {
+          item.disabled = false;
+          flag = true;
+        } else if (
+          item.typeDetail == "FULLCOUPON" &&
+          isDuringDate(item.useStartDate, item.useDeadlineDate) &&
+          item.fullAmount <= allShopMoney -allFullMoney
+        ) {
+          item.disabled = false;
+          flag = true;
+        } else {
+          item.disabled = true;
+        }
+      });
+      // 已经选了得 继续保持可以选
+      this.dataList.forEach((item) => {
+        if (list.indexOf(item.couponCodeId) != -1) {
+          flag = true;
+          item.disabled = false;
+        }
+      });
+      this.dataList.sort((obj1, obj2) => {
+        return obj1.disabled - obj2.disabled;
+      });
+      this.$forceUpdate();
+      return flag;
+    },
+    setTitle(val) {
+      let flag = false;
+      if (this.isEdit) {
+        flag = this.setListDisabled([]);
+        console.log("调用list,setTitle");
+      } else {
+        this.dataList = this.dataList.map((item) => {
+          item.disabled = true;
+          return item;
+        });
+      }
+      if (flag) {
+        this.$emit("resetTitle", "有可用优惠券");
+      } else {
+        this.$emit("resetTitle", "暂无优惠券可用");
+      }
+    },
+  },
+  watch: {
+    allMoney(val) {
+      // console.log(val, 'allMoney', this.nowMoney, 'nowMoney', this.checkCouponList)
+      this.setTitle([]);
+    },
+  },
+};
+</script>
+
+<style lang="less"  scoped>
+.list {
+  // background-color: #fff;
+  width: 3.51rem;
+  margin: auto;
+  border-radius: 0.1rem;
+  padding-top: 0.01rem;
+}
+/deep/.van-checkbox__icon .van-icon {
+  border-color: #ffa4a4 !important;
+}
+</style>

src/views/liveActive/model/previewVideo.vue

@@ -151,9 +151,10 @@ export default {
     color: #666666;
     line-height: 0.28rem;
   }
-  /deep/.plyr {
-    min-width: 100%;
-  }
+}
+
+/deep/.plyr {
+  min-width: 100%;
 }
 
 .iosClass {

src/views/service/GoodsOrder.vue

@@ -0,0 +1,505 @@
+<template>
+  <div class="goodsOrder">
+    <m-header :backUrl="backUrl" />
+    <van-tabs
+      color="#01C1B5"
+      title-active-color="#000"
+      @change="onTabChange"
+      title-inactive-color="#808080"
+      v-model="activeTab"
+    >
+      <van-tab title="待支付" name="ING">
+        <search
+          @onSearch="onSearch"
+          placeholder="请输入学生姓名或手机号"
+          style="margin-bottom: 0.15rem"
+        />
+        <van-list
+          v-model="loading"
+          v-if="dataShow"
+          key="ing"
+          :finished="finished"
+          :immediate-check="false"
+          finished-text=" "
+          @load="getGoodsList()"
+        >
+          <van-cell-group
+            class="order-section"
+            :border="false"
+            v-for="(list, index) in dataList"
+            :key="index"
+            @click="onGoodDetail(list)"
+          >
+            <van-cell title-class="order-title" value-class="order-status">
+              <template #title>学生姓名：{{ list.userName }}</template>
+              <template>待支付</template>
+            </van-cell>
+            <van-cell
+              v-for="(item, i) in list.goodsJson"
+              :border="i == list.goodsJson.length - 1 ? true : false"
+              :key="i"
+              :class="[
+                i != list.goodsJson.length - 1 ? 'input-bottom' : null,
+                'input-cell',
+              ]"
+              class="input-cell"
+              :center="true"
+            >
+              <template slot="icon">
+                <van-image :src="item.image" class="logo">
+                  <template v-slot:loading>
+                    <van-loading type="spinner" size="20" />
+                  </template>
+                </van-image>
+              </template>
+              <template slot="title">
+                {{ item.goodsName }}
+                <p class="money">￥{{ item.goodsPrice | moneyFormat }}</p>
+              </template>
+              <template #default> x {{ item.goodsNum }} </template>
+            </van-cell>
+            <van-cell
+              title-class="order-money"
+              title-style="flex: auto 1"
+              style="align-items: center"
+              class="van-hairline--top"
+            >
+              <template #title>
+                订单金额：<span>¥{{ list.totalAmount | moneyFormat }}</span>
+              </template>
+              <template>
+                <van-button
+                  size="small"
+                  round
+                  class="van-small__btn"
+                  @click.stop="onRePay(list)"
+                  type="default"
+                  >继续支付</van-button
+                >
+              </template>
+            </van-cell>
+          </van-cell-group>
+        </van-list>
+        <m-empty v-else msg="暂无订单" />
+      </van-tab>
+      <van-tab title="已支付" name="SUCCESS">
+        <search
+          @onSearch="onSearch2"
+          placeholder="请输入学生姓名或手机号"
+          style="margin-bottom: 0.15rem"
+        />
+        <van-list
+          v-model="loading2"
+          v-if="dataShow2"
+          key="success"
+          :immediate-check="false"
+          :finished="finished2"
+          finished-text=" "
+          @load="getGoodsList2()"
+        >
+          <van-cell-group
+            class="order-section"
+            :border="false"
+            v-for="(list, index) in dataList2"
+            :key="index"
+            @click="onGoodDetail(list)"
+          >
+            <van-cell
+              title-class="order-title"
+              value-class="order-status success"
+            >
+              <template #title
+                >学生姓名：{{ list.userName }}
+                <span
+                  style="padding-left: 0.1rem"
+                  v-if="list.authorUser != operationId"
+                  >学员自建</span
+                ></template
+              >
+              <template>支付成功</template>
+            </van-cell>
+            <van-cell
+              v-for="(item, i) in list.goodsJson"
+              :border="i == list.goodsJson.length - 1 ? true : false"
+              :key="i"
+              :class="[
+                i != list.goodsJson.length - 1 ? 'input-bottom' : null,
+                'input-cell',
+              ]"
+              :center="true"
+            >
+              <template slot="icon">
+                <van-image :src="item.image" class="logo">
+                  <template v-slot:loading>
+                    <van-loading type="spinner" size="20" />
+                  </template>
+                </van-image>
+              </template>
+              <template slot="title">
+                {{ item.goodsName }}
+                <p class="money">￥{{ item.goodsPrice | moneyFormat }}</p>
+              </template>
+              <template #default> x {{ item.goodsNum }} </template>
+            </van-cell>
+            <van-cell
+              title-class="order-money"
+              class="van-hairline--top order-payment"
+              title=" "
+            >
+              <template #title>
+                订单金额：<span>¥{{ list.totalAmount | moneyFormat }}</span>
+              </template>
+              <template>
+                <div>
+                  <div
+                    class="order-money-get"
+                    v-if="list.receiveStatus == 'NO_RECEIVE'"
+                  >
+                    未确认
+                  </div>
+                  <div v-if="list.receiveStatus == 'AUTO_RECEIVE'">
+                    自动确认收货
+                  </div>
+                  <div v-if="list.receiveStatus == 'MANUAL_RECEIVE'">
+                    手动确认收货
+                  </div>
+                </div>
+              </template>
+            </van-cell>
+          </van-cell-group>
+        </van-list>
+        <m-empty v-else msg="暂无订单" />
+      </van-tab>
+    </van-tabs>
+
+    <m-payment
+      :closeStatus="isStatus"
+      :amount="payMoney"
+      :payment="payment"
+      @onChangeStatus="onChangeStatus"
+    />
+  </div>
+</template>
+
+<script>
+/* eslint-disable */
+import { queryStudentGoodsOrders, addGoodsSellOrder } from "./api";
+import MHeader from "@/components/MHeader";
+import MEmpty from "@/components/MEmpty";
+import MPayment from "@/components/MPayment";
+import Search from "@/components/Search";
+import setLoading from "@/common/loading";
+export default {
+  name: "goodsOrder",
+  components: {
+    MHeader,
+    MEmpty,
+    Search,
+    MPayment,
+  },
+  data() {
+    let query = this.$route.query;
+    let operationId = localStorage.getItem("operationId");
+    return {
+      operationId: operationId,
+      activeTab: query.activeTab ? query.activeTab : "ING",
+      isStatus: false,
+      payment: {}, // 支付对象
+      payMoney: 0,
+      dataList: [],
+      dataShow: true,
+      loading: false,
+      finished: false,
+      params: {
+        search: null,
+        status: "ING",
+        page: 1,
+        rows: 10,
+      },
+      dataList2: [],
+      dataShow2: true,
+      loading2: false,
+      finished2: false,
+      params2: {
+        search: null,
+        status: "SUCCESS",
+        page: 1,
+        rows: 10,
+      },
+      backUrl: {
+        status: true,
+        path: "/serviceStudent",
+      },
+    };
+  },
+  async mounted() {
+    // 判断是否在app里面
+    localStorage.removeItem("orderGoodsDetail");
+    await this.onTabChange();
+  },
+  methods: {
+    onTabChange() {
+      if (this.activeTab == "ING") {
+        this.getGoodsList();
+      } else if (this.activeTab == "SUCCESS") {
+        this.getGoodsList2();
+      }
+    },
+    onGoodDetail(item) {
+      localStorage.setItem("orderGoodsDetail", JSON.stringify(item));
+      this.$router.push({
+        path: "/goodsOrderDetail",
+        query: {
+          activeTab: this.activeTab,
+        },
+      });
+    },
+    onSearch(value) {
+      this.params.search = value;
+      this.params.page = 1;
+      this.dataList = [];
+      this.dataShow = true;
+      this.loading = true;
+      this.finished = false;
+      this.getGoodsList();
+    },
+    async getGoodsList() {
+      let params = this.params;
+      try {
+        await queryStudentGoodsOrders(params).then((res) => {
+          let result = res.data;
+          this.loading = false;
+          if (res.code == 200) {
+            let rows = result.rows;
+            rows.forEach((item) => {
+              item.goodsJson = item.goodsJson ? JSON.parse(item.goodsJson) : [];
+            });
+            this.dataList.push(...rows);
+            if (params.page >= Math.ceil(result.total / params.rows)) {
+              this.finished = true;
+            }
+            this.params.page++;
+          } else {
+            this.finished = true;
+          }
+          if (this.dataList.length <= 0) {
+            this.dataShow = false;
+          }
+        });
+      } catch {
+        //
+      }
+    },
+    onSearch2(value) {
+      this.params2.search = value;
+      this.params2.page = 1;
+      this.dataList2 = [];
+      this.dataShow2 = true;
+      this.loading2 = true;
+      this.finished2 = false;
+      this.getGoodsList2();
+    },
+    async getGoodsList2() {
+      let params = this.params2;
+      try {
+        await queryStudentGoodsOrders(params).then((res) => {
+          let result = res.data;
+          this.loading2 = false;
+          if (res.code == 200) {
+            let rows = result.rows;
+            rows.forEach((item) => {
+              item.goodsJson = item.goodsJson ? JSON.parse(item.goodsJson) : [];
+            });
+            this.dataList2.push(...rows);
+            if (params.page >= Math.ceil(result.total / params.rows)) {
+              this.finished2 = true;
+            }
+            this.params2.page++;
+          } else {
+            this.finished2 = true;
+          }
+          if (this.dataList2.length <= 0) {
+            this.dataShow2 = false;
+          }
+        });
+      } catch {
+        //
+      }
+    },
+    async onChangeStatus(val) {
+      this.isStatus = val;
+      this.dataList = [];
+      this.dataShow = true;
+      this.loading = true;
+      this.finished = false;
+      this.params = {
+        status: "ING",
+        page: 1,
+        rows: 10,
+      };
+      this.getGoodsList();
+    },
+    onRePay(item) {
+      // 是否继续支付
+      this.$dialog
+        .confirm({
+          message: "是否继续支付该订单？",
+          confirmButtonColor: "#269a93",
+          cancelButtonText: "取消",
+          confirmButtonText: "继续支付",
+        })
+        .then(() => {
+          this.buy(item);
+        })
+        .catch(() => {
+          this.$dialog.close();
+        });
+    },
+    async buy(item) {
+      let goodsList = this.goodsList;
+      setLoading(true);
+      await addGoodsSellOrder({
+        userId: item.userId,
+        goodsSellDtos: item.goodsJson,
+        isRepeatPay: true,
+        marketAmount: item.marketAmount,
+        orderNo: item.orderNo,
+        id: item.id,
+      })
+        .then((res) => {
+          setLoading(false);
+          let result = res.data;
+          if (result.code == 200) {
+            this.result = result.data;
+            this.onSubmit();
+          } else if (result.code == 201) {
+            this.$toast(result.msg);
+            this.$router.push({
+              path: "/paymentResult",
+              query: {
+                type: "on",
+                isBack: "off",
+              },
+            });
+          } else {
+            this.$toast(result.msg);
+          }
+        })
+        .catch(() => {
+          setLoading(false);
+        });
+    },
+    onSubmit() {
+      // submit 提交
+      let result = this.result;
+      if (result.type == "YQPAY") {
+        let f = result.payMap;
+        document.querySelector("#onSubmit").action = f.host;
+        document.querySelector("#apiContent").value = f.apiContent;
+        document.querySelector("#merNo").value = f.merNo;
+        document.querySelector("#notifyUrl").value = f.notifyUrl;
+        document.querySelector("#sign").value = f.sign;
+        document.querySelector("#signType").value = f.signType;
+        document.querySelector("#timestamp").value = f.timestamp;
+        document.querySelector("#version").value = f.version;
+        document.querySelector("#onSubmit").submit();
+      } else if (result.type == "UNIONPAY") {
+        localStorage.setItem("payInfo", JSON.stringify(result));
+        this.$router.push({
+          path: "/alipay",
+          query: {
+            balance: result.totalPrice,
+          },
+        });
+      } else if (result.type == "ADAPAY") {
+        this.payment = result;
+        this.payMoney = result.payMap.amount;
+        // 开始支付窗口
+        this.isStatus = true;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.goodsOrder {
+  min-height: 100vh;
+  overflow: hidden;
+}
+
+.order-section {
+  margin: 0 0.12rem 0.16rem;
+  border-radius: 0.08rem;
+  overflow: hidden;
+}
+/deep/.van-tabs--line .van-tabs__wrap {
+  height: 0.44rem;
+}
+
+.order-title {
+  color: #808080;
+  font-size: 0.14rem;
+  flex: auto 1;
+}
+
+.order-status {
+  font-size: 0.14rem;
+  color: #f5222d;
+
+  &.success {
+    color: #01c1b5;
+  }
+}
+
+.van-small__btn {
+  font-size: 0.14rem;
+  background-color: #f85043;
+  border-color: #f85043;
+  color: #fff;
+  height: 0.3rem;
+  padding: 0 0.08rem;
+  line-height: 0.28rem;
+}
+
+.order-money {
+  color: #000;
+  font-size: 0.16rem;
+
+  span {
+    color: #ff3535;
+  }
+}
+.order-payment {
+  // margin-top: .15rem;
+}
+
+.input-cell {
+  padding: 0.15rem 0.16rem;
+  &.input-bottom {
+    padding-bottom: 0;
+  }
+  .logo {
+    width: 1rem;
+    height: 1rem;
+    margin-right: 0.15rem;
+    border-radius: 0.05rem;
+  }
+
+  .money {
+    color: #ff3535;
+    font-weight: 600;
+    font-size: 0.18rem;
+  }
+
+  /deep/.van-cell__title {
+    font-size: 0.16rem;
+    color: #000000;
+    flex-basis: 47%;
+  }
+
+  /deep/.van-cell__value {
+    height: 0.2rem;
+  }
+}
+</style>

src/views/service/GoodsOrderDetail.vue

@@ -0,0 +1,404 @@
+<template>
+  <div class="goodsOrder">
+    <m-header :backUrl="backUrl" />
+    <van-cell-group
+      v-if="goodsDetail"
+      class="order-section"
+      style="margin-top: 0.1rem"
+    >
+      <van-cell
+        v-for="(item, index) in goodsDetail.goodsJson"
+        @click="getGoodsDetail(item)"
+        is-link
+        :key="index"
+        class="input-cell"
+        :center="true"
+      >
+        <template slot="icon">
+          <van-image :src="item.image" class="logo">
+            <template v-slot:loading>
+              <van-loading type="spinner" size="20" />
+            </template>
+          </van-image>
+        </template>
+        <template slot="title">
+          {{ item.goodsName }}
+          <p class="money">￥{{ item.goodsPrice | moneyFormat }}</p>
+        </template>
+        <template #default> x {{ item.goodsNum }} </template>
+      </van-cell>
+    </van-cell-group>
+
+    <van-cell-group v-if="goodsDetail" class="order-section order-info">
+      <p class="order-item">
+        <span>订单总金额</span><span>￥{{ allPrice | moneyFormat }}</span>
+      </p>
+      <p class="order-item">
+        <span>应付金额</span
+        ><span style="color: #ff3535"
+          >￥{{ goodsDetail.totalAmount | moneyFormat }}</span
+        >
+      </p>
+      <p class="order-item">
+        <span>乐器减免</span
+        ><span>￥{{ -goodsDetail.marketAmount | moneyFormat }}</span>
+      </p>
+      <p class="order-item">
+        <span>优惠券</span
+        ><span>￥{{ -goodsDetail.couponRemitFee | moneyFormat }}</span>
+      </p>
+      <p class="order-item">
+        <span>余额支付</span
+        ><span>￥{{ -goodsDetail.balancePaymentAmount | moneyFormat }}</span>
+      </p>
+      <p class="order-item">
+        <span>现金支付</span
+        ><span>￥{{ goodsDetail.actualAmount | moneyFormat }}</span>
+      </p>
+      <p class="order-item">
+        <span>订单状态</span>
+        <span v-if="goodsDetail.status == 'SUCCESS'" style="color: #01c1b5"
+          >支付成功</span
+        >
+        <span v-else style="color: #ff3535">待支付</span>
+      </p>
+      <p class="order-item">
+        <span>学员姓名</span><span>{{ goodsDetail.userName }}</span>
+      </p>
+      <p class="order-item">
+        <span>收货状态</span>
+        <span
+          v-if="goodsDetail.receiveStatus == 'NO_RECEIVE'"
+          style="color: #ff802c"
+          >未确认收货</span
+        >
+        <span v-if="goodsDetail.receiveStatus == 'AUTO_RECEIVE'"
+          >自动确认收货</span
+        >
+        <span v-if="goodsDetail.receiveStatus == 'MANUAL_RECEIVE'"
+          >手动确认收货</span
+        >
+      </p>
+      <p class="order-item">
+        <span>订单号</span><span>{{ goodsDetail.orderNo }}</span>
+      </p>
+      <p class="order-item">
+        <span>交易流水号</span
+        ><span
+          style="max-width: 60%; word-break: break-all; line-height: 1.5"
+          >{{ goodsDetail.transNo }}</span
+        >
+      </p>
+      <p class="order-item">
+        <span>创建时间</span><span>{{ goodsDetail.createTime }}</span>
+      </p>
+      <p class="order-item">
+        <span>付款时间</span><span>{{ goodsDetail.payTime }}</span>
+      </p>
+    </van-cell-group>
+
+    <!-- 商品详情 -->
+    <van-popup
+      v-model="goodsStatus"
+      class="goodsDetail"
+      :lock-scroll="true"
+      position="bottom"
+      :style="{ height: '100%' }"
+    >
+      <m-header :backUrl="backUrl2" name="商品详情" />
+      <van-cell-group>
+        <van-cell class="input-cell" :center="true">
+          <template slot="icon">
+            <van-image
+              :src="popupGoodsDetail.image"
+              class="logo"
+              style="width: 1rem; height: 1rem"
+            >
+              <template v-slot:loading>
+                <van-loading type="spinner" size="20" />
+              </template>
+            </van-image>
+          </template>
+          <template slot="title">
+            <div>{{ popupGoodsDetail.name }}</div>
+            <van-tag plain color="#C2A076" style="margin: 0.04rem 0"
+              >品牌：{{ popupGoodsDetail.brand }}</van-tag
+            >
+            <div class="price-section">
+              <span class="money"
+                ><i>现价：￥</i
+                >{{ popupGoodsDetail.discountPrice | moneyFormat }}</span
+              >
+              <del
+                >原价：￥{{ popupGoodsDetail.marketPrice | moneyFormat }}</del
+              >
+            </div>
+          </template>
+        </van-cell>
+      </van-cell-group>
+
+      <van-cell-group>
+        <van-cell
+          title="品牌"
+          value-class="valueStyle"
+          :value="popupGoodsDetail.brand"
+          :center="true"
+        ></van-cell>
+        <van-cell title="商品类型" value-class="valueStyle" :center="true">
+          {{ popupGoodsDetail.type | shopType }}
+        </van-cell>
+        <van-cell
+          title="商品分类"
+          value-class="valueStyle"
+          :value="popupGoodsDetail.goodsCategoryName"
+          :center="true"
+        ></van-cell>
+        <van-cell
+          title="具体型号"
+          value-class="valueStyle"
+          :value="popupGoodsDetail.specification"
+          :center="true"
+        ></van-cell>
+      </van-cell-group>
+
+      <van-cell-group style="margin-bottom: 0.75rem">
+        <van-cell
+          title="商品详情"
+          style="flex-direction: column"
+          title-class="title-detail"
+          value-class="value-detail"
+          :value="popupGoodsDetail.desc"
+        ></van-cell>
+      </van-cell-group>
+
+      <van-row gutter="10" type="flex" justify="center" class="btn-group">
+        <van-col span="22">
+          <van-button
+            @click="goodsStatus = false"
+            type="primary"
+            color="#01C1B5"
+            round
+            block
+            >关闭</van-button
+          >
+        </van-col>
+      </van-row>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+/* eslint-disable */
+import { browser } from "@/common/util";
+import MHeader from "@/components/MHeader";
+import MEmpty from "@/components/MEmpty";
+import setLoading from "@/common/loading";
+import { goodsGet } from "./api";
+export default {
+  name: "goodsOrder",
+  components: { MHeader, MEmpty },
+  data() {
+    let query = this.$route.query;
+    let that = this;
+    return {
+      headerStatus: false,
+      goodsDetail: null,
+      backUrl: {
+        status: true,
+        path: "/goodsOrder?activeTab=" + query.activeTab,
+      },
+      backUrl2: {
+        callBack() {
+          that.goodsStatus = false;
+        },
+      },
+      goodsStatus: false,
+      popupGoodsDetail: {},
+    };
+  },
+  mounted() {
+    // 判断是否在app里面
+    document.title = "订单详情";
+    this.__init();
+  },
+  methods: {
+    __init() {
+      let goodsDetail = localStorage.getItem("orderGoodsDetail");
+      goodsDetail = goodsDetail ? JSON.parse(goodsDetail) : null;
+      this.goodsDetail = goodsDetail;
+    },
+    async getGoodsDetail(item) {
+      // 判断是否请求同一个商品信息
+      if (
+        this.popupGoodsDetail.id &&
+        this.popupGoodsDetail.id == item.goodsId
+      ) {
+        this.goodsStatus = true;
+        return;
+      }
+      setLoading(true);
+      await goodsGet(item.goodsId)
+        .then((res) => {
+          setLoading(false);
+          let result = res.data;
+          if (result.code == 200) {
+            this.popupGoodsDetail = result.data;
+            this.goodsStatus = true;
+          }
+        })
+        .catch(() => {
+          setLoading(false);
+        });
+    },
+  },
+  destroyed() {
+    localStorage.removeItem("orderGoodsDetail");
+  },
+  computed: {
+    allPrice() {
+      let money = 0;
+      if (Array.isArray(this.goodsDetail.goodsJson)) {
+        this.goodsDetail.goodsJson.forEach((goods) => {
+          money += goods.goodsPrice * goods.goodsNum;
+        });
+      }
+
+      return money;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.goodsOrder {
+  min-height: 100vh;
+  overflow: hidden;
+}
+/deep/.van-tab__pane {
+  padding-top: 0.2rem;
+}
+/deep/.van-tab {
+  color: #333;
+  font-size: 0.17rem;
+}
+/deep/.van-tab--active {
+  color: #01c1b5;
+}
+.order-section {
+  margin: 0 0.12rem 0.16rem;
+  border-radius: 0.05rem;
+  overflow: hidden;
+  &.order-info {
+    padding: 0.15rem 0.16rem;
+  }
+  .order-item {
+    font-size: 0.14rem;
+    color: #333;
+    line-height: 2;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+.order-title {
+  color: #808080;
+  font-size: 0.14rem;
+  flex: auto 1;
+}
+.order-status {
+  font-size: 0.14rem;
+  color: #f5222d;
+  &.success {
+    color: #01c1b5;
+  }
+}
+.order-money {
+  color: #000;
+  font-size: 0.16rem;
+  span {
+    color: #ff3535;
+  }
+}
+.input-cell {
+  padding: 0.12rem 0.16rem;
+  .logo {
+    width: 1rem;
+    height: 1rem;
+    margin-right: 0.15rem;
+    border-radius: 0.05rem;
+    overflow: hidden;
+  }
+
+  .price-section {
+    del {
+      font-size: 0.12rem;
+      color: #666666;
+      padding-left: 0.1rem;
+    }
+  }
+
+  .money {
+    color: #ff3535;
+    font-weight: 600;
+    font-size: 0.16rem;
+    i {
+      font-style: normal;
+      font-size: 0.14rem;
+    }
+  }
+
+  /deep/.van-cell__title {
+    font-size: 0.16rem;
+    color: #000000;
+    flex: 1 auto;
+  }
+
+  /deep/.van-cell__value {
+    height: 0.2rem;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+}
+.goodsDetail {
+  background: #f3f4f8;
+  /deep/.van-cell-group {
+    margin-bottom: 0.15rem;
+  }
+  /deep/.van-cell {
+    padding: 0.1rem 0.16rem;
+    line-height: 1.5;
+    font-size: 0.14rem;
+    color: #808080;
+  }
+  .valueStyle {
+    color: #000000;
+  }
+
+  .title-detail {
+    font-size: 0.16rem;
+    color: #000;
+    padding-bottom: 0.1rem;
+  }
+
+  .value-detail {
+    font-size: 0.14rem;
+    color: #808080;
+    text-align: left;
+  }
+
+  .btn-group {
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    padding: 0.1rem 0;
+    // padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+    .van-button {
+      font-size: 0.16rem;
+      height: 0.44rem;
+      line-height: 0.42rem;
+    }
+  }
+}
+</style>

src/views/service/GoodsSale.vue

@@ -0,0 +1,1168 @@
+<template>
+  <div class="goodsOrder">
+    <div ref="goodsOrder">
+      <m-header />
+
+      <van-cell-group>
+        <van-field
+          readonly
+          clickable
+          label="订单类型"
+          :value="orderText"
+          input-align="right"
+          placeholder="选择类型"
+          @click="showPicker = true"
+        />
+        <van-popup v-model="showPicker" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="columns"
+            @cancel="showPicker = false"
+            @confirm="onConfirm"
+          />
+        </van-popup>
+        <van-field
+          :readonly="true"
+          label="学生姓名"
+          v-model="studentName"
+          placeholder="请输入学生姓名"
+          input-align="right"
+        />
+        <van-field
+          label="选择商品"
+          :readonly="true"
+          @click="goodsStatus = true"
+          is-link
+          placeholder="选择商品"
+          input-align="right"
+        />
+        <van-cell
+          v-for="(item, index) in goodsList"
+          :key="index"
+          class="input-cell"
+          :center="true"
+        >
+          <template slot="icon">
+            <van-image :src="item.image" class="logo">
+              <template v-slot:loading>
+                <van-loading type="spinner" size="20" />
+              </template>
+            </van-image>
+          </template>
+          <template slot="title">
+            <div>{{ item.goodsName }}</div>
+            <div class="price-section detail">
+              <span class="money"
+                ><i>现价：￥</i>{{ item.discountPrice | moneyFormat }}</span
+              >
+              <p class="groupPrice">
+                <span class="groupTitle">团购价：</span
+                ><span class="groupMoney"
+                  >￥{{ item.groupPurchasePrice | moneyFormat }}</span
+                >
+              </p>
+            </div>
+
+            <div style="position: absolute; right: 0.16rem; bottom: 0.1rem">
+              <van-stepper
+                @change="calcPrice"
+                :disable-input="true"
+                v-model="item.goodsNum"
+                button-size="22"
+              />
+            </div>
+            <van-icon
+              class="icon_close"
+              name="cross"
+              @click="onGoodDel(goodsList, item)"
+            />
+          </template>
+        </van-cell>
+      </van-cell-group>
+
+      <!-- 是否用余额支付 支付金额大于0时才会显示是否用余额支付 -->
+      <van-cell-group class="pay-section">
+        <van-cell
+          :disabled="false"
+          title="总价格"
+          title-class="pay-name"
+          value-class="pay-value"
+          :center="true"
+        >
+          <template #default> ￥{{ payCountMoney | moneyFormat }} </template>
+        </van-cell>
+        <van-field
+          label="减免金额"
+          @input="setNoMore"
+          v-model="marketAmount"
+          type="number"
+          ref="marketInput"
+          placeholder="请输入减免金额"
+          input-align="right"
+        />
+      </van-cell-group>
+
+      <protocol
+        v-model="agreeStatus"
+        :userId="studentId.toString()"
+        style="padding-top: 0.08rem"
+      />
+
+      <div class="button-group">
+        <van-button
+          class="btn-sure"
+          type="primary"
+          @click="onRefundSure(obj)"
+          round
+          size="large"
+          >确认</van-button
+        >
+      </div>
+    </div>
+
+    <van-popup
+      class="popup-qrcode"
+      v-model="qrCodeStatus"
+      closeable
+      close-icon="cross"
+      @close="onClose"
+    >
+      <div id="qrcode">
+        <vue-qr
+          :logoSrc="config.imagePath"
+          :text="config.value"
+          :margin="10"
+          :size="220"
+        ></vue-qr>
+      </div>
+      <a
+        id="tt"
+        ref="download"
+        v-show="false"
+        :href="downloadUrl"
+        :download="downloadfilename"
+      ></a>
+      <!-- <p>点击图片进行下载</p> -->
+      <van-button
+        v-if="!headerStatus"
+        color="#01C1B5"
+        :disabled="downloadStatus"
+        type="primary"
+        @click="createPoster"
+        round
+        >下载二维码</van-button
+      >
+    </van-popup>
+
+    <van-popup
+      v-model="goodsStatus"
+      :lock-scroll="true"
+      position="bottom"
+      :style="{ height: '100%', borderRadius: '0', overflowY: 'auto' }"
+    >
+      <van-sticky offset-top="0">
+        <m-header :backUrl="backUrl2" name="商品列表" :isFixed="false" />
+        <search @onSearch="onSearch" placeholder="请输入商品名称" />
+        <van-dropdown-menu active-color="#01C1B5">
+          <van-dropdown-item
+            :title="valueText1"
+            v-model="value1"
+            :options="option1"
+            @change="onOptionChange"
+          />
+          <van-dropdown-item
+            :title="valueText2"
+            v-model="value2"
+            :options="option2"
+            @change="onOptionChange"
+          />
+        </van-dropdown-menu>
+      </van-sticky>
+
+      <div>
+        <van-list
+          v-model="loading"
+          class="studentContainer"
+          v-if="dataShow"
+          key="data"
+          :finished="finished"
+          finished-text=""
+          @load="getGoodsList"
+        >
+          <van-cell-group>
+            <van-cell
+              v-for="(item, index) in dataList"
+              :key="index"
+              class="input-cell"
+              @click="onChoiceGood(item)"
+              :center="true"
+            >
+              <template slot="icon">
+                <van-image :src="item.image" class="logo">
+                  <template v-slot:loading>
+                    <van-loading type="spinner" size="20" />
+                  </template>
+                </van-image>
+              </template>
+              <template slot="title">
+                <div>{{ item.name }}</div>
+                <van-tag plain color="#C2A076" style="margin: 0.04rem 0"
+                  >品牌：{{ item.brand }}</van-tag
+                >
+                <div class="price-section">
+                  <span class="money"
+                    ><i>现价：￥</i>{{ item.discountPrice | moneyFormat }}</span
+                  >
+                  <p class="groupPrice">
+                    <span class="groupTitle">团购价：</span
+                    ><span class="groupMoney"
+                      >￥{{ item.groupPurchasePrice | moneyFormat }}</span
+                    >
+                  </p>
+                </div>
+                <div class="price-section">
+                  <del>原价：￥{{ item.marketPrice | moneyFormat }}</del>
+                </div>
+              </template>
+            </van-cell>
+          </van-cell-group>
+        </van-list>
+        <m-empty class="empty" v-else />
+      </div>
+    </van-popup>
+
+    <!-- 协议 -->
+    <van-popup id="protocolPopup" v-model="popupStatus" position="bottom">
+      <m-protocol
+        :protocolHTML="protocolHTML"
+        @onClose="popupStatus = !popupStatus"
+        @onPopupSure="popupStatus = !popupStatus"
+      />
+    </van-popup>
+
+    <van-popup v-model="refundStatus" position="bottom" v-if="refundStatus">
+      <m-refund
+        @onClose="refundStatus = !refundStatus"
+        @onPopupSure="onRefundSure"
+        :ids="[1, 2]"
+        :buyList="buyList"
+        :balance="this.orderType == 1 ? balance : 0"
+      />
+    </van-popup>
+
+    <m-payment
+      :closeStatus="isStatus"
+      :amount="payMoney"
+      :payment="payment"
+      @onChangeStatus="onChangeStatus"
+    />
+  </div>
+</template>
+<script>
+import MHeader from "@/components/MHeader";
+import MPayment from "@/components/MPayment";
+import Protocol from "@/components/Protocol";
+import MRefund from "@/components/MRefund";
+import MEmpty from "@/components/MEmpty";
+import Search from "@/components/Search";
+import {
+  addGoodsSellOrder,
+  queryGoodsPage,
+  queryGoodsCategoryPage,
+  getUserCashAccount,
+} from "./api";
+import { browser, validStudentUrl } from "@/common/util";
+import setLoading from "@/common/loading";
+import VueQr from "vue-qr";
+export default {
+  name: "teacherList",
+  components: {
+    MHeader,
+    VueQr,
+    MPayment,
+    MEmpty,
+    Protocol,
+    MRefund,
+    Search,
+  },
+  data() {
+    let query = this.$route.query;
+    // 保存之前输入的内容
+    return {
+      value1: "all",
+      valueText1: "类型: 全部",
+      option1: [
+        {
+          text: "全部",
+          value: "all",
+        },
+        {
+          text: "乐器",
+          value: "INSTRUMENT",
+        },
+        {
+          text: "辅件",
+          value: "ACCESSORIES",
+        },
+        {
+          text: "教材",
+          value: "TEACHING",
+        },
+        {
+          text: "教谱",
+          value: "STAFF",
+        },
+      ],
+      couponObj: {
+        INSTRUMENT: "MUSICAL",
+        ACCESSORIES: "ACCESSORIES",
+        TEACHING: "TEACHING",
+        STAFF: "OTHER",
+      },
+      value2: "all",
+      valueText2: "商品: 全部",
+      search: null,
+      option2: [],
+      goodsStatus: false,
+      dataList: [],
+      radio: "1",
+      studentId: query.studentId, // 学生编号
+      organId: query.organId,
+      studentName: query.studentName,
+      goodsList: [],
+      marketAmount: null,
+      tempForm: {}, // 临时存数据
+      payType: false, // 是否使用余额
+      balance: 0, // 余额
+      isClick: false,
+      downloadStatus: true,
+      qrCodeStatus: false,
+      downloadUrl: null,
+      downloadfilename: null,
+      sGoodsOrderId: null,
+      config: {
+        value: null, //显示的值、跳转的地址
+        imagePath: require("../../assets/images/logo-s.png"), //中间logo的地址
+      },
+      headerStatus: true,
+      isStatus: false,
+      payment: {}, // 支付对象
+      payMoney: 0,
+      payCountAmount: 0,
+      loading: false,
+      finished: false,
+      params: {
+        status: 1,
+        // studentShowOrganId: query.organId || null,
+        // educationalShow: 1, // 是否是教务端显示
+        page: 1,
+        rows: 20,
+      },
+      dataShow: true, // 是否有数据
+      clickStatus: false,
+      choiceGood: null,
+      backUrl2: {
+        callBack: () => {
+          this.goodsStatus = false;
+        },
+      },
+      refundStatus: false,
+      refundSure: false, // 是否确认退费规则
+      buyList: [],
+      disCountList: [],
+      moneyList: [],
+      payCountMoney: 0,
+      protocolHTML: null,
+      agreeStatus: false,
+      popupStatus: false,
+      couponShow: false,
+      couponList: [],
+      valuePirce: 0,
+      dataLists: [],
+      countMoney: 0,
+      groupPrice: 0,
+      obj: null,
+      showPicker: false,
+      columns: ["教务代买", "创建订单"],
+      orderType: null,
+      orderText: null,
+    };
+  },
+  mounted() {
+    // 插入token
+    if (browser().android || browser().iPhone) {
+      this.headerStatus = false;
+    }
+    this.__init();
+  },
+  methods: {
+    onConfirm(value, index) {
+      this.orderText = value;
+      if (index == 0) {
+        this.orderType = 1;
+      } else if (index == 1) {
+        this.orderType = 2;
+      } else {
+        this.orderType = null;
+      }
+      this.showPicker = false;
+    },
+    onRefundSure(obj) {
+      if (obj) {
+        this.refundStatus = false;
+        this.refundSure = true;
+        this.obj = obj;
+        if (this.orderType == 1) {
+          this.onCheckSubmit();
+        } else {
+          this.onCreateCode();
+        }
+      } else {
+        // 第一次 判断是否
+        if (this.orderType == 1) {
+          this.onCheckSubmit();
+        } else {
+          this.onCreateCode();
+        }
+      }
+    },
+    onOptionChange() {
+      this.option1.forEach((item) => {
+        if (item.value == this.value1) {
+          this.valueText1 = item.value == "all" ? "类型: 全部" : item.text;
+        }
+      });
+
+      this.option2.forEach((item) => {
+        if (item.value == this.value2) {
+          this.valueText2 = item.value == "all" ? "商品: 全部" : item.text;
+        }
+      });
+
+      this.params.page = 1;
+      this.dataList = [];
+      this.dataShow = true;
+      this.loading = true;
+      this.finished = false;
+      this.getGoodsList();
+    },
+    onChoiceGood(item) {
+      let goodsList = this.goodsList;
+      let status = false;
+      goodsList.forEach((good) => {
+        if (good.goodsId == item.id) {
+          status = true;
+          ++good.goodsNum;
+        }
+      });
+      // 判断是否有同样的商品
+      if (!status) {
+        goodsList.push({
+          goodsNum: 1, // 默认数据为1件
+          goodsId: item.id,
+          image: item.image,
+          goodsName: item.name,
+          marketPrice: item.marketPrice,
+          discountPrice: item.discountPrice,
+          complementGoodsIdList: item.complementGoodsIdList,
+          groupPurchasePrice: item.groupPurchasePrice,
+          type: item.type,
+        });
+      }
+      this.goodsStatus = false;
+      // this.resetCoupon();
+      this.calcPrice();
+    },
+    onGoodDel(goodsList, item) {
+      this.$dialog
+        .confirm({
+          title: "提示",
+          message: "是否删除该商品",
+          confirmButtonColor: "#01C1B5",
+        })
+        .then(() => {
+          let index = goodsList.indexOf(item);
+          if (index !== -1) {
+            goodsList.splice(index, 1);
+          }
+          this.calcPrice();
+        });
+    },
+    onSearch(value) {
+      // 商品搜索
+      this.search = value;
+      this.params.page = 1;
+      this.dataList = [];
+      this.loading = true;
+      this.finished = false;
+      this.dataShow = true;
+      this.getGoodsList();
+    },
+    async getGoodsList() {
+      let params = this.params;
+      params.type = this.value1 == "all" ? null : this.value1;
+      params.goodsCategoryId = this.value2 == "all" ? null : this.value2;
+      params.search = this.search ? this.search : null;
+      await queryGoodsPage(params).then((res) => {
+        let result = res.data;
+        this.loading = false;
+        if (result.code == 200) {
+          params.page = result.data.pageNo;
+          this.dataList = this.dataList.concat(result.data.rows);
+          if (params.page >= result.data.totalPage) {
+            this.finished = true;
+          }
+          this.params.page++;
+        } else {
+          this.finished = true;
+        }
+        // 判断是否有数据
+        if (this.dataList.length <= 0) {
+          this.dataShow = false;
+        }
+      });
+    },
+    async __init() {
+      try {
+        await getUserCashAccount({ id: this.studentId }).then((res) => {
+          this.balance = res.data.balance || 0;
+        });
+
+        await queryGoodsCategoryPage({
+          delFlag: 0,
+          rows: 9999,
+        }).then((res) => {
+          let result = res.data;
+          if (result.code == 200) {
+            let tempArray = [
+              {
+                text: "全部",
+                value: "all",
+              },
+            ];
+            result.data.rows.forEach((row) => {
+              tempArray.push({
+                text: row.name,
+                value: row.id,
+              });
+            });
+            this.option2 = tempArray;
+          }
+        });
+      } catch {
+        //
+      }
+    },
+    async onCreateCode() {
+      if (!this.onCheckFiled()) {
+        return;
+      }
+      // console.log(!this.refundSure, this.payCountMoney - this.marketAmount > 0);
+      // 确认退费规则
+      if (!this.refundSure && this.payCountMoney - this.marketAmount > 0) {
+        this.refundStatus = true;
+        return;
+      }
+      let form = {
+        studentId: this.studentId,
+        goodsList: JSON.stringify(this.goodsList),
+        marketAmount: this.marketAmount ? this.marketAmount : 0,
+        couponIdList: this.obj.couponIdList,
+      };
+      let formCheckChange = false;
+      let tempForm = this.tempForm;
+      // 判断是否修改过内容
+      if (
+        form.studentId == tempForm.studentId &&
+        form.goodsList == tempForm.goodsList &&
+        form.marketAmount == tempForm.marketAmount &&
+        JSON.stringify(form.couponList) == JSON.stringify(tempForm.couponList)
+      ) {
+        formCheckChange = true;
+      }
+
+      if (this.sGoodsOrderId && formCheckChange) {
+        this.onPosterCode(this.sGoodsOrderId);
+      } else {
+        form.type = 1;
+        this.tempForm = form;
+        setLoading(true);
+        await addGoodsSellOrder({
+          userId: this.studentId,
+          goodsSellDtos: this.goodsList,
+          marketAmount: this.marketAmount ? this.marketAmount : 0,
+          type: 1,
+          couponIdList: this.obj.couponIdList || [],
+        })
+          .then((res) => {
+            setLoading(false);
+            let tempGoods = res.data;
+            if (tempGoods.code == 200) {
+              this.sGoodsOrderId = tempGoods.data.id;
+              this.onPosterCode(tempGoods.data.id);
+            } else {
+              this.$toast(res.msg);
+            }
+          })
+          .catch((e) => {
+            // console.log(e);
+            setLoading(false);
+          });
+      }
+      setTimeout(() => {
+        this.isClick = false;
+      }, 500);
+    },
+    onPosterCode(goodsId) {
+      this.$refs.goodsOrder.style.filter = "blur(3px)";
+      this.qrCodeStatus = true;
+      let url =
+        validStudentUrl() +
+        "/#/goodsOrderBuy?id=" +
+        goodsId +
+        "&studentId=" +
+        this.studentId;
+      // console.log(url)
+      this.config.value = url;
+      // 可以点击下载按钮了
+      this.downloadStatus = false;
+    },
+    createPoster() {
+      let tempImg = document.querySelector("#qrcode img");
+      this.downloadUrl = tempImg.src;
+      this.downloadfilename = "qrCode.png";
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true,
+        message: "下载中...",
+      });
+      if (browser().android) {
+        setTimeout(() => {
+          this.$toast.clear();
+          //a 标签下载
+          this.$refs.download.click();
+        }, 2000);
+      } else if (browser().iPhone) {
+        setTimeout(() => {
+          this.$toast.clear();
+          //a 标签下载
+          window.webkit.messageHandlers.DAYA.postMessage(
+            JSON.stringify({
+              api: "downLoadImg",
+              content: {
+                downloadUrl: tempImg.src,
+              },
+            })
+          );
+        }, 2000);
+      }
+    },
+    onClose() {
+      this.$refs.goodsOrder.style.filter = "blur(0px)";
+    },
+    async onChangeStatus(val) {
+      try {
+        this.isStatus = val;
+        await getUserCashAccount({ id: this.studentId }).then((res) => {
+          this.balance = res.data.balance || 0;
+        });
+        this.payType = false;
+        this.calcPrice();
+      } catch {
+        //
+      }
+    },
+    async onCheckSubmit() {
+      if (!this.onCheckFiled()) {
+        return;
+      }
+      // 确认退费规则
+      if (!this.refundSure && this.payCountMoney - this.marketAmount > 0) {
+        this.refundStatus = true;
+        return;
+      }
+
+      let goodsList = this.goodsList;
+      setLoading(true);
+      await addGoodsSellOrder({
+        userId: this.studentId,
+        goodsSellDtos: goodsList,
+        marketAmount: this.marketAmount ? this.marketAmount : 0,
+        isUseBalancePayment: this.obj.payType,
+        couponIdList: this.obj.couponIdList,
+      })
+        .then((res) => {
+          setLoading(false);
+          let result = res.data;
+          if (result.code == 200) {
+            // this.resetCoupon();
+            this.result = result.data;
+            this.onSubmit();
+          } else if (result.code == 201) {
+            this.$toast(result.msg);
+            this.$router.push({
+              path: "/paymentResult",
+              query: {
+                type: "on",
+                isBack: "off",
+                groupType: "GOODS_SELL",
+              },
+            });
+          } else {
+            this.$toast(result.msg);
+          }
+        })
+        .catch(() => {
+          setLoading(false);
+        });
+      this.refundSure = false;
+    },
+    onCheckFiled() {
+      if (!this.orderType) {
+        this.$toast("请选择订单类型");
+        return false;
+      }
+      if (this.goodsList.length <= 0) {
+        this.$toast("请选择商品");
+        return false;
+      }
+      if (this.marketAmount) {
+        let reg =
+          /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+        if (!reg.test(this.marketAmount)) {
+          this.$toast("请选输入正确的减免金额");
+          return false;
+        }
+      }
+      if (
+        (this.payCountMoney - Number(this.marketAmount)).toFixed(2) <
+        this.groupPrice
+      ) {
+        this.$toast("减免后支付金额不能低于团购价");
+        return false;
+      }
+      if (this.payCountMoney - this.marketAmount < 0) {
+        this.$toast("减免金额不能大于总金额");
+        return false;
+      }
+
+      if (!this.agreeStatus) {
+        this.$toast("请先阅读并同意《产品及服务协议》");
+        return false;
+      }
+      return true;
+    },
+    onSubmit() {
+      // submit 提交
+      let result = this.result;
+      if (result.type == "YQPAY") {
+        let f = result.payMap;
+        document.querySelector("#onSubmit").action = f.host;
+        document.querySelector("#apiContent").value = f.apiContent;
+        document.querySelector("#merNo").value = f.merNo;
+        document.querySelector("#notifyUrl").value = f.notifyUrl;
+        document.querySelector("#sign").value = f.sign;
+        document.querySelector("#signType").value = f.signType;
+        document.querySelector("#timestamp").value = f.timestamp;
+        document.querySelector("#version").value = f.version;
+        document.querySelector("#onSubmit").submit();
+      } else if (result.type == "UNIONPAY") {
+        localStorage.setItem("payInfo", JSON.stringify(result));
+        this.$router.push({
+          path: "/alipay",
+          query: {
+            balance: result.totalPrice,
+          },
+        });
+      } else if (result.type == "ADAPAY") {
+        this.payment = result;
+        this.payMoney = result.payMap.amount;
+        // 开始支付窗口
+        this.isStatus = true;
+      }
+    },
+    onClickCheckbox() {
+      // 使用余额方法
+      this.payType = !this.payType;
+      this.calcPrice();
+    },
+    setCoupon(obj) {
+      // this.disCountList = [];
+      if (obj) {
+        this.couponList = obj.couponList;
+        this.valuePirce = obj.valuePirce;
+        this.dataLists = obj.dataList;
+      }
+
+      this.calcPrice();
+    },
+    // resetCoupon() {
+    //   this.couponList = [];
+    //   this.valuePirce = 0;
+    //   this.disCountList = [];
+    //   this.$refs.Mcoupon.resetCoupon();
+    // },
+    setNoMore() {
+      // this.resetCoupon();
+      this.calcPrice();
+    },
+    calcPrice() {
+      let goodsList = this.goodsList;
+      let tempPrice = 0;
+      this.groupPrice = 0;
+      this.buyList = [];
+      this.moneyList = [];
+      this.disCountList = [];
+      // console.log(this.goodsList, "goodsList");
+      goodsList.forEach((item) => {
+        this.buyList.push({
+          name:
+            item.goodsNum > 1
+              ? `${item.goodsName} * ${item.goodsNum}`
+              : item.goodsName,
+          type: "购买",
+          price: Number((item.goodsNum * item.discountPrice).toFixed(2)),
+          couponType: this.couponObj[item.type],
+        });
+        tempPrice += Number((item.goodsNum * item.discountPrice).toFixed(2));
+        this.groupPrice += Number(
+          (item.goodsNum * item.groupPurchasePrice).toFixed(2)
+        );
+      });
+      const couponType = {
+        FULL_REDUCTION: "满减",
+        DISCOUNT: "折扣",
+      };
+      if (this.dataLists && this.dataLists.length > 0) {
+        this.dataLists.forEach((item) => {
+          if (this.couponList.indexOf(item.couponCodeId) != -1) {
+            this.disCountList.push({
+              name: item.couponName,
+              type: couponType[item.couponType],
+              price: -item.faceValue.toFixed(2),
+            });
+          }
+        });
+      }
+
+      if (this.marketAmount > 0) {
+        this.buyList.push({
+          name: "减免金额",
+          type: "一次性",
+          price: -this.marketAmount,
+          couponType: "FULLCOUPON",
+        });
+      }
+
+      this.payCountMoney = tempPrice;
+      if (tempPrice - this.marketAmount <= 0) {
+        tempPrice = 0;
+      } else {
+        tempPrice = Number((tempPrice - this.marketAmount).toFixed(2));
+      }
+      this.countMoney = tempPrice;
+      tempPrice -= this.valuePirce;
+      this.moneyList.push({ name: "应付金额", price: tempPrice });
+      // 是否使用余额
+      if (this.payType) {
+        if (tempPrice - this.balance >= 0) {
+          this.moneyList.push({ name: "余额支付", price: this.balance });
+          tempPrice = Number((tempPrice - this.balance).toFixed(2));
+          this.moneyList.push({ name: "现金支付", price: tempPrice });
+        } else {
+          this.moneyList.push({ name: "现金支付", price: 0 });
+          this.moneyList.push({ name: "余额支付", price: tempPrice });
+          tempPrice = 0;
+        }
+      } else {
+        this.moneyList.push({ name: "余额支付", price: 0 });
+        this.moneyList.push({ name: "现金支付", price: tempPrice });
+      }
+      this.payMoney = tempPrice;
+    },
+  },
+  destroyed() {
+    // 销毁页面时
+    this.$toast.clear();
+    this.qrCodeStatus = false;
+  },
+  computed: {
+    groupAllPrice() {},
+  },
+};
+</script>
+<style lang="less" scoped>
+@import url("../../assets/commonLess/variable.less");
+.goodsOrder {
+  min-height: 100vh;
+}
+/deep/.van-popup--bottom {
+  border-radius: 0px 0px 0px 0px !important;
+  overflow: auto !important;
+}
+.pay-name {
+  // padding-left: 0.1rem;
+  flex: 1 auto;
+  font-weight: bold;
+}
+/deep/.van-cell__title {
+  font-size: 0.17rem;
+  color: @mFontColor;
+  flex: 1 auto;
+  width: 65%;
+}
+
+/deep/.van-cell__value {
+  font-size: 0.17rem;
+  flex: 1 auto;
+  width: 50%;
+}
+
+/deep/.van-cell-group {
+  margin-top: 0.15rem;
+}
+
+.textarea {
+  flex-direction: column;
+
+  /deep/.van-cell__value {
+    padding-top: 0.1rem;
+    flex: 1 auto;
+    width: 100%;
+    font-size: 0.15rem;
+    color: #666;
+  }
+
+  /deep/.van-field__control {
+    color: #666;
+  }
+}
+
+/deep/.van-popup__close-icon--top-right {
+  font-size: 0.24rem;
+  color: #c0c0c0;
+  top: 0.1rem;
+  right: 0.1rem;
+}
+
+/deep/.van-stepper__input {
+  background-color: #fff;
+}
+
+.pay-section {
+  .van-checkbox {
+    float: right;
+
+    /deep/.van-checkbox__icon .van-icon {
+      border-color: #aeb3c0;
+    }
+
+    /deep/.van-checkbox__icon--checked .van-icon {
+      background-color: #01c1b5;
+      border-color: #01c1b5;
+      color: #fff;
+    }
+  }
+
+  .van-cell__value {
+    width: auto;
+  }
+
+  .logo {
+    margin-right: 0.08rem;
+    width: 0.24rem;
+    height: 0.24rem;
+  }
+}
+
+#qrcode {
+  background: #fff;
+  // padding: .05rem;
+  margin: 10px auto 0;
+}
+
+.popup-qrcode {
+  width: 80%;
+  // width: 220px;
+  padding: 0.2rem 0;
+  border-radius: 0.05rem;
+  text-align: center;
+
+  .van-button--primary {
+    margin-top: 0.1rem;
+  }
+
+  .loading-section {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.button-group {
+  margin: 0.3rem 0.26rem 0.2rem;
+
+  .btn-sure {
+    background: @mColor;
+    border: 1px solid @mColor;
+    font-size: 0.18rem;
+  }
+
+  .btn-qrcode {
+    margin-top: 0.15rem;
+    font-size: 0.18rem;
+    background: transparent;
+  }
+}
+
+.studentContainer {
+  /deep/.van-cell-group {
+    margin-top: 0;
+  }
+
+  /deep/.van-cell__title {
+    font-size: 0.14rem;
+    color: @mFontColor;
+    flex: 1 auto;
+  }
+
+  .logo {
+    width: 0.45rem;
+    height: 0.45rem;
+    margin-right: 0.12rem;
+    border-radius: 100%;
+  }
+
+  .input-cell {
+    padding: 0.12rem 0.16rem;
+
+    .van-radio {
+      justify-content: flex-end;
+    }
+  }
+
+  /deep/.van-cell__value {
+    height: 0.2rem;
+  }
+
+  .van-tag {
+    margin-left: 0.08rem;
+  }
+}
+
+.pay-value {
+  color: #01c1b5;
+}
+
+.input-cell {
+  padding: 0.12rem 0.16rem;
+
+  .logo {
+    width: 0.82rem;
+    height: 0.82rem;
+    margin-right: 0.15rem;
+    border-radius: 0.05rem;
+    overflow: hidden;
+  }
+  .detail.price-section {
+    display: inline-block;
+  }
+  .price-section {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    del {
+      font-size: 0.12rem;
+      color: #666666;
+      // padding-left: 0.1rem;
+    }
+    .groupPrice {
+      // min-width: 1.05rem;
+      line-height: 0.16rem;
+      height: 0.16rem;
+      font-size: 0.12rem;
+      border: 1px solid #ff4444;
+      color: #fff;
+      display: flex;
+      flex-direction: row;
+      text-align: center;
+      line-height: 0.16rem;
+      background-color: #fff0f0;
+      .groupTitle {
+        background: #ff4444;
+        color: #fff;
+        display: block;
+        padding: 0 0.025rem;
+      }
+      .groupMoney {
+        background-color: #fff0f0;
+        color: #ff4444;
+        display: block;
+        padding: 0 0.025rem;
+        line-height: 16px;
+      }
+    }
+  }
+
+  .money {
+    color: #ff3535;
+    font-weight: 600;
+    font-size: 0.12rem;
+    display: flex;
+    flex-direction: row;
+    i {
+      font-style: normal;
+      font-size: 0.12rem;
+    }
+  }
+
+  /deep/.van-cell__title {
+    font-size: 0.16rem;
+    color: #000000;
+    flex: 1 auto;
+  }
+
+  /deep/.van-cell__value {
+    height: 0.2rem;
+  }
+}
+
+.icon_close {
+  position: absolute;
+  right: 0.16rem;
+  top: 0.16rem;
+  font-size: 0.2rem;
+  color: #929292;
+}
+
+.agreeProtocol {
+  display: flex;
+  align-items: center;
+  color: #333333;
+  margin-top: 0.1rem;
+  padding: 0.05rem 0.16rem;
+  font-size: 14px;
+  line-height: 0.2rem;
+
+  .van-checkbox {
+    padding-right: 0.08rem;
+  }
+
+  /deep/.van-checkbox__icon .van-icon {
+    background: #fff;
+  }
+
+  /deep/.van-checkbox__icon--checked .van-icon {
+    color: #fff;
+    background-color: #f85043;
+    border-color: #f85043;
+  }
+
+  span {
+    color: #01c1b5;
+  }
+}
+</style>

src/views/service/ServiceList.vue

@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <van-sticky>
+      <m-header :backUrl="backUrl" :isFixed="false"> </m-header>
+      <search @onSearch="onSearch" placeholder="请输入乐团名称" />
+    </van-sticky>
+    <van-list
+      class="teamList"
+      v-model="loading"
+      v-if="dataShow"
+      key="data"
+      :finished="finished"
+      :immediate-check="false"
+      finished-text="- 没有更多内容 -"
+      @load="getTeamList"
+    >
+      <van-cell
+        :title="item.name"
+        is-link
+        v-for="item in dataList"
+        :key="item.id"
+        @click="gotoDetail(item)"
+      >
+        <template #default>
+          <div>
+            <p>乐保生效人数:{{ item.hasInstrumentNum || 0 }}</p>
+            <p>乐团在读人数:{{ item.payNum || 0 }}</p>
+          </div>
+        </template>
+      </van-cell>
+    </van-list>
+    <m-empty class="empty" v-else key="data" />
+  </div>
+</template>
+<script>
+import MHeader from "@/components/MHeader";
+import search from "@/components/Search";
+import MEmpty from "@/components/MEmpty";
+import { repairTeamQueryPage } from "./api";
+export default {
+  components: {
+    MHeader,
+    search,
+    MEmpty,
+  },
+  data() {
+    return {
+      backUrl: {
+        status: true,
+        path: "/home",
+      },
+      dataShow: true,
+      loading: false,
+      finished: false,
+      params: {
+        musicGroupName: null,
+        page: 1,
+        rows: 20,
+      },
+      dataList: [],
+    };
+  },
+  mounted() {
+    this.getTeamList();
+  },
+
+  methods: {
+    onSearch(val) {
+      this.params.musicGroupName = val;
+      this.params.page = 1;
+      this.dataList = [];
+      this.dataShow = true;
+      this.loading = true;
+      this.finished = false;
+      this.getTeamList();
+    },
+    async getTeamList() {
+      let params = this.params;
+      params.search = params.musicGroupName ? params.musicGroupName : null;
+      let teamList = null;
+      // if (this.type == 'sale') {
+      // 	studentList = await queryEduStudents(params)
+      // } else {
+      teamList = await repairTeamQueryPage(params);
+      // }
+      let result = teamList.data;
+      this.loading = false;
+      if (result.code == 200) {
+        // 重点这句，判断是不是重复请求了
+        if (this.dataList.length > 0 && result.data.pageNo == 1) {
+          return;
+        }
+        params.page = result.data.pageNo;
+        this.dataList = this.dataList.concat(result.data.rows);
+        if (params.page >= result.data.totalPage) {
+          this.finished = true;
+        }
+        this.params.page++;
+      } else {
+        this.finished = true;
+      }
+      // 判断是否有数据
+      if (this.dataList.length <= 0) {
+        this.dataShow = false;
+      }
+    },
+    gotoDetail(row) {
+      this.$router.push({
+        path: "/teamStudentList",
+        query: { musicGroupId: row.id },
+      });
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.cellDetail {
+  text-align: right;
+}
+.teamList {
+  /deep/.van-cell {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/views/service/ServiceStudent.vue

@@ -0,0 +1,287 @@
+<template>
+  <div style="min-height: 100vh">
+    <van-sticky>
+      <m-header :backUrl="backUrl" :isFixed="false">
+        <template slot="right">
+          <div
+            @click="
+              () => {
+                $router.push('/goodsOrder');
+              }
+            "
+          >
+            商品订单
+          </div>
+        </template>
+      </m-header>
+      <search @onSearch="onSearch" placeholder="请输入姓名或手机号" />
+    </van-sticky>
+    <van-list
+      v-model="loading"
+      v-if="dataShow"
+      :finished="finished"
+      :immediate-check="false"
+      finished-text="- 没有更多内容 -"
+      @load="getStudent"
+    >
+      <van-radio-group v-model="radioSelect">
+        <van-cell-group>
+          <van-cell
+            v-for="(item, index) in dataList"
+            :key="index"
+            @click="onSelect(item)"
+            title-class="title-class"
+            class="input-cell"
+            :center="true"
+            is-link
+          >
+            <template slot="icon">
+              <img
+                class="logo"
+                v-if="item.headUrl"
+                :src="item.headUrl"
+                alt=""
+              />
+              <img
+                class="logo"
+                v-else
+                src="@/assets/images/icon_students.png"
+                alt=""
+              />
+            </template>
+            <template slot="title">
+              <div class="label">
+                {{ item.name }}
+                <span class="phone_section">
+                  {{ item.phone ? desensitPhone(item.phone) : null }}
+                  <a
+                    @click.stop="() => {}"
+                    v-if="type != 'sale'"
+                    style="height: 0.17rem"
+                    :href="'tel:' + item.phone"
+                    ><i class="icon_phone"></i
+                  ></a>
+                </span>
+              </div>
+            </template>
+            <!-- <template slot="default">
+              <van-radio :name="item.userId">
+                <template #icon="props">
+                  <img
+                    class="img-icon"
+                    :src="props.checked ? activeButtonIcon : inactiveButtonIcon"
+                  />
+                </template>
+              </van-radio>
+            </template> -->
+          </van-cell>
+        </van-cell-group>
+      </van-radio-group>
+    </van-list>
+    <m-empty class="empty" v-else />
+    <!-- <div class="button-group">
+            <van-button type="primary" @click="onSubmit" round size="large">确认选择</van-button>
+        </div> -->
+  </div>
+</template>
+<script>
+import MHeader from "@/components/MHeader";
+import search from "@/components/Search";
+import MEmpty from "@/components/MEmpty";
+import { getStudentsByTeacherOrgan } from "./api";
+export default {
+  name: "teacherList",
+  components: {
+    MHeader,
+    search,
+    MEmpty,
+  },
+  data() {
+    let query = this.$route.query;
+    // 如果有 保存记录，测删除
+    localStorage.removeItem("repaireForm");
+    return {
+      type: query.type,
+      radioSelect: null,
+      radioSelectOrganId: null,
+      loading: false,
+      finished: false,
+      params: {
+        search: null,
+        page: 1,
+        rows: 20,
+      },
+      dataShow: true, // 是否有数据
+      dataList: [],
+      backUrl: {
+        status: true,
+        path: "/home",
+      },
+    };
+  },
+  async mounted() {
+    await this.getStudent();
+  },
+  methods: {
+    onSelect(item) {
+      // 商品销售
+      this.$router.push({
+        path: "/goodsSale",
+        query: {
+          studentId: item.userId,
+          studentName: item.name,
+          organId: item.organId,
+        },
+      });
+      // this.radioSelect = item.userId;
+      // this.radioSelectOrganId = item.organId;
+    },
+    onSubmit() {
+      if (!this.radioSelect) {
+        this.$toast("请选择学生");
+        return;
+      }
+      localStorage.setItem("studentId", this.radioSelect);
+      let studentName = null;
+      this.dataList.forEach((item) => {
+        if (item.userId == this.radioSelect) {
+          studentName = item.name;
+        }
+      });
+      // 商品销售
+      this.$router.push({
+        path: "/goodsSale",
+        query: {
+          studentId: this.radioSelect,
+          studentName: studentName,
+          organId: this.radioSelectOrganId,
+        },
+      });
+    },
+    // 搜索
+    onSearch(val) {
+      this.params.search = val;
+      this.params.page = 1;
+      this.dataList = [];
+      this.dataShow = true;
+      this.loading = true;
+      this.finished = false;
+      this.getStudent();
+    },
+    async getStudent() {
+      let params = this.params;
+      params.search = params.search ? params.search : null;
+      let studentList = null;
+      // if (this.type == 'sale') {
+      // 	studentList = await queryEduStudents(params)
+      // } else {
+      studentList = await getStudentsByTeacherOrgan(params);
+      // }
+      let result = studentList.data;
+      this.loading = false;
+      if (studentList.code == 200) {
+        // 重点这句，判断是不是重复请求了
+        if (this.dataList.length > 0 && result.pageNo == 1) {
+          return;
+        }
+        params.page = result.pageNo;
+        this.dataList = this.dataList.concat(result.rows);
+        if (params.page >= result.totalPage) {
+          this.finished = true;
+        }
+        this.params.page++;
+      } else {
+        this.finished = true;
+      }
+      // 判断是否有数据
+      if (this.dataList.length <= 0) {
+        this.dataShow = false;
+      }
+    },
+    desensitPhone(phone) {
+      // 手机号脱敏
+      let first = phone.substr(0, 3);
+      let last = phone.substr(-4);
+      return first + "****" + last;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+@import url("../../assets/commonLess/variable.less");
+
+/deep/.van-cell__title {
+  font-size: 0.14rem;
+  color: @mFontColor;
+  flex: 1 auto;
+}
+
+.logo {
+  width: 0.42rem;
+  height: 0.42rem;
+  margin-right: 0.12rem;
+  border-radius: 100%;
+}
+
+.input-cell {
+  padding: 0.12rem 0.16rem 0.2rem;
+
+  .van-radio {
+    justify-content: flex-end;
+  }
+}
+
+/deep/.van-cell__value {
+  height: 0.24rem;
+}
+
+/deep/.van-radio__icon .van-icon {
+  border-color: @sFontColor;
+}
+
+/deep/.van-radio__icon--checked {
+  .van-icon {
+    border-color: @orangeColor;
+    background: @orangeColor;
+  }
+}
+
+.van-tag {
+  margin-left: 0.08rem;
+}
+
+.button-group {
+  margin: 0.3rem 0.26rem 0.2rem;
+
+  .van-button--primary {
+    background: @mColor;
+    border: 1px solid @mColor;
+    font-size: 0.18rem;
+  }
+}
+.phone_section {
+  display: flex;
+  align-items: center;
+  font-size: 0.14rem;
+  color: #999;
+}
+.icon_phone {
+  margin-left: 0.1rem;
+  width: 0.14rem;
+  height: 0.17rem;
+  display: inline-block;
+  background: url("../../assets/images/icon_phone.png") no-repeat center center;
+  background-size: contain;
+}
+
+.title-class {
+  display: flex;
+  align-items: center;
+  .label {
+    display: flex;
+    flex-direction: column;
+    font-size: 0.16rem;
+    color: #1a1a1a;
+  }
+}
+</style>