Browse Source

Merge remote-tracking branch 'origin/master'

master
liutong 1 year ago
parent
commit
3cc15bbbf2
  1. 2
      App.vue
  2. 31
      api/Search.js
  3. 79
      api/hygl.js
  4. 175
      api/user.js
  5. 89
      common/axiosB.js
  6. 2
      components/AQ/AQTabber.vue
  7. 2
      components/CommentList.vue
  8. 2
      manifest.json
  9. 2
      pages/coach/class/info.vue
  10. 2
      pages/coach/class/list.vue
  11. 2
      pages/coach/course/info.vue
  12. 2
      pages/coach/course/list.vue
  13. 2
      pages/coach/home/index.vue
  14. 2
      pages/coach/job/add.vue
  15. 2
      pages/coach/job/list.vue
  16. 2
      pages/coach/my/arrival_statistics.vue
  17. 2
      pages/coach/my/due_soon.vue
  18. 2
      pages/coach/my/index.vue
  19. 2
      pages/coach/my/info.vue
  20. 2
      pages/coach/my/schooling_statistics.vue
  21. 2
      pages/coach/student/info.vue
  22. 2
      pages/common/feedback.vue
  23. 2
      pages/market/clue/clue_info.vue
  24. 2
      pages/market/data/index.vue
  25. 2
      pages/market/my/index.vue
  26. 2
      pages/market/my/info.vue
  27. 2
      pages/student/my/my.vue
  28. 2
      pages/student/my/personal_data.vue
  29. 2
      pages/student/timetable/index.vue
  30. 2
      pages/student/timetable/info.vue
  31. 2
      pages/student/timetable/list.vue

2
App.vue

@ -2,7 +2,7 @@
import { import {
WxToken WxToken
} from './common/wx_token.js' } from './common/wx_token.js'
import user from '@/api/user.js' // import user from '@/api/user.js'
import Api_url from '@/common/config.js' import Api_url from '@/common/config.js'
var wxtoken = new WxToken(); var wxtoken = new WxToken();

31
api/Search.js

@ -1,31 +0,0 @@
import http from '../common/axios.js'
//获取搜索记录
function search_record(data) {
let url = '/dnseyeapi/Search/record'
return http.get(url,data).then(res => {
return res;
})
}
//获取搜索记录
function delete_record(data) {
let url = '/dnseyeapi/Search/deleterecord'
return http.get(url,data).then(res => {
return res;
})
}
//搜索
function ferret_about(data) {
let url = '/dnseyeapi/Search/ferretabout'
return http.post(url,data).then(res => {
return res;
})
}
export default {
search_record,
delete_record,
ferret_about
}

79
api/hygl.js

@ -1,79 +0,0 @@
import httpB from '../common/axiosB.js'
//微信支付相关接口
export default {
test,
getSiteInfo,
getOpenid,
getMiniOpenid,
getUser,
getUserCoupons,
addOrder,
wxMpPay,
wxMiniPay,
getAdvertising,
}
// 账号密码登录
function test() {
let url = '/test'
return httpB.get(url)
}
//获取站点信息
function getSiteInfo(data) {
let url = '/getSiteInfo'
return httpB.get(url,data)
}
//获取微信公众号openid
function getOpenid(data) {
let url = '/getOpenid'
return httpB.post(url,data)
}
//获取微信小程序openid
function getMiniOpenid(data) {
let url = '/getMiniOpenid'
return httpB.post(url,data)
}
//获取用户信息
function getUser(data){
let url = '/getUser'
return httpB.get(url,data)
}
//获取用户拥有的优惠券
function getUserCoupons(data){
let url = '/getUserCoupons'
return httpB.get(url,data)
}
//创建订单接口
function addOrder(data){
let url = '/addOrder'
return httpB.get(url,data)
}
//微信公众号支付
function wxMpPay(data){
let url = '/wxMpPay'
return httpB.post(url,data)
}
//微信公众号支付
function wxMiniPay(data){
let url = '/wxMiniPay'
return httpB.post(url,data)
}
//获取广告列表
function getAdvertising(data){
let url = '/getAdvertising'
return httpB.get(url,data)
}

175
api/user.js

@ -1,175 +0,0 @@
import http from '../common/axios.js'
// 发布内容
function activity_add(data) {
let url = '/dnseyeapi/Activity/add'
return http.post(url, data).then(res => {
return res;
})
}
// 查看内容
function activity_index(data) {
let url = '/dnseyeapi/Activity/index'
return http.post(url,data).then(res => {
return res;
})
}
// 查看详情内容
function coninfo(data) {
let url = '/dnseyeapi/Activity/coninfo'
return http.post(url,data).then(res => {
return res;
})
}
// 查看内容
function activity_like(data) {
let url = '/dnseyeapi/Activity/like'
return http.post(url,data).then(res => {
return res;
})
}
// 我的页面计数
function mycount(data) {
let url = '/dnseyeapi/Activity/mycount'
return http.post(url,data).then(res => {
return res;
})
}
// 收藏页面
function mycollect(data) {
let url = '/dnseyeapi/Activity/mycollect'
return http.post(url,data).then(res => {
return res;
})
}
// 获取用户信息
function getuserinfo(data) {
let url = '/dnseyeapi/Myinfo/getuserinfo'
return http.post(url,data).then(res => {
return res;
})
}
// 修改用户信息
function updateinfo(data) {
let url = '/dnseyeapi/Myinfo/updateinfo'
return http.post(url,data).then(res => {
return res;
})
}
// 修改用户通知状态
function updatestatus(data) {
let url = '/dnseyeapi/Myinfo/updatestatus'
return http.post(url,data).then(res => {
return res;
})
}
// 帮助中心
function helplist() {
let url = '/dnseyeapi/Activity/helplist'
return http.post(url).then(res => {
return res;
})
}
//图片验证码
function verify() {
let url = '/dnseyeapi/Login/verify'
return http.post(url).then(res => {
return res;
})
}
//图片验证码
function forgot(data) {
let url = '/dnseyeapi/Login/forgot'
return http.post(url,data).then(res => {
return res;
})
}
//评论
function comment(data) {
let url = '/dnseyeapi/Activity/comment'
return http.post(url,data).then(res => {
return res;
})
}
//评论详情
function comment_list(data) {
let url = '/dnseyeapi/Activity/comment_list'
return http.post(url,data).then(res => {
return res;
})
}
//子评论
function comments(data) {
let url = '/dnseyeapi/Activity/comments'
return http.post(url,data).then(res => {
return res;
})
}
//子评论
function comments_list(data) {
let url = '/dnseyeapi/Activity/comments_list'
return http.post(url,data).then(res => {
return res;
})
}
//获取城市信息
function locate_information(data) {
let url = '/dnseyeapi/Activity/locate_information'
return http.post(url,data).then(res => {
return res;
})
}
//查看用户是否关注公众号
function is_interest(data) {
let url = '/dnseyeapi/Myinfo/is_interest'
return http.post(url,data).then(res => {
return res;
})
}
//获取公众号二维码及文字
function gzhconfig(data) {
let url = '/dnseyeapi/Myinfo/gzhconfig'
return http.post(url,data).then(res => {
return res;
})
}
export default {
activity_add,
activity_index,
activity_like,
mycount,
mycollect,
getuserinfo,
helplist,
verify,
forgot,
updateinfo,
updatestatus,
coninfo,
comments,
comment_list,
comment,
comments_list,
locate_information,
is_interest,
gzhconfig
}

89
common/axiosB.js

@ -1,89 +0,0 @@
import {
Api_url_B
} from './config'
// import {Token} from './token.js'
// var token = new Token();
export default {
async post(url, param, yanci = false) {
// wx.showLoading();
// setTimeout(() => {
// wx.hideLoading();
// }, 3000)
const res = await this.uni_request(url, param, 'post')
return res;
},
async get(url, param, yanci = false) {
// wx.showLoading();
// setTimeout(() => {
// wx.hideLoading();
// }, 3000)
const res = await this.uni_request(url, param, 'get')
return res;
},
async put(url, param) {
// wx.showLoading();
// setTimeout(() => {
// wx.hideLoading();
// }, 3000)
const res = await this.uni_request(url, param, 'put')
return res;
},
uni_request(url, param, method, again_quest = false) {
const that = this
uni.showLoading({
title:'加载中...'
})
return new Promise((cback, reject) => {
console.log(Api_url_B + url)
uni.request({
url: Api_url_B + url,
data: param,
method: method,
header: {
'token': uni.getStorageSync("token")
},
}).then(data => { //data为一个数组,数组第一项为错误信息,第二项为返回数据
var [error, res] = data;
uni.hideLoading()
var res_code = res.statusCode.toString();
if (res_code.charAt(0) == 2) {
if (res_code == 200) {
cback(res.data);
} else {
console.log('201', url)
uni.showToast({
title: res.data.msg,
icon: 'none'
})
}
} else {
if (res_code == 401) {
//登录失效
console.log('401', url)
if (again_quest) {
// token.getTokenFromServer(()=>{
// const again_res=that.uni_request(url,param,method,false)
// //注意这里需要cback,因为是上一个promis的cback
// cback(again_res);
// });
} else {
console.log('再次登陆仍然失败', url)
}
} else {
console.log('400/500', url, error, res)
uni.showToast({
title: res.data.msg ? res.data.msg : '请求异常',
icon: 'none'
})
}
}
}).catch(err => {
console.log('catch:', err);
})
})
},
}

2
components/AQ/AQTabber.vue

@ -50,7 +50,7 @@
methods: { methods: {
async init() { async init() {
uni.setStorageSync('userType', '2') uni.setStorageSync('userType', '3')
let userType = uni.getStorageSync('userType') let userType = uni.getStorageSync('userType')
this.userType = userType this.userType = userType

2
components/CommentList.vue

@ -79,7 +79,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import fuiCollapse from "@/components/firstui/fui-collapse/fui-collapse.vue" import fuiCollapse from "@/components/firstui/fui-collapse/fui-collapse.vue"
import fuiCollapseItem from "@/components/firstui/fui-collapse-item/fui-collapse-item.vue" import fuiCollapseItem from "@/components/firstui/fui-collapse-item/fui-collapse-item.vue"
import fuiUpload from "@/components/firstui/fui-upload/fui-upload.vue" import fuiUpload from "@/components/firstui/fui-upload/fui-upload.vue"

2
manifest.json

@ -1,6 +1,6 @@
{ {
"name" : "用药提醒", "name" : "用药提醒",
"appid" : "__UNI__E2F1940", "appid" : "__UNI__86A3E16",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",

2
pages/coach/class/info.vue

@ -385,7 +385,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/class/list.vue

@ -100,7 +100,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/course/info.vue

@ -55,7 +55,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/course/list.vue

@ -163,7 +163,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/home/index.vue

@ -176,7 +176,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/job/add.vue

@ -26,7 +26,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"
export default { export default {

2
pages/coach/job/list.vue

@ -57,7 +57,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/my/arrival_statistics.vue

@ -60,7 +60,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/my/due_soon.vue

@ -164,7 +164,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/my/index.vue

@ -95,7 +95,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/my/info.vue

@ -117,7 +117,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import {Api_url} from "@/common/config.js"; import {Api_url} from "@/common/config.js";
import AQTabber from "@/components/AQ/AQTabber" import AQTabber from "@/components/AQ/AQTabber"

2
pages/coach/my/schooling_statistics.vue

@ -100,7 +100,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/coach/student/info.vue

@ -174,7 +174,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/common/feedback.vue

@ -33,7 +33,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti'; import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti';
import AQTabber from "@/components/AQ/AQTabber" import AQTabber from "@/components/AQ/AQTabber"

2
pages/market/clue/clue_info.vue

@ -320,7 +320,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
export default { export default {

2
pages/market/data/index.vue

@ -146,7 +146,7 @@
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/market/my/index.vue

@ -92,7 +92,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/market/my/info.vue

@ -117,7 +117,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import {Api_url} from "@/common/config.js"; import {Api_url} from "@/common/config.js";
import AQTabber from "@/components/AQ/AQTabber" import AQTabber from "@/components/AQ/AQTabber"

2
pages/student/my/my.vue

@ -82,7 +82,7 @@
<script> <script>
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"
import user from '@/api/user.js'; // import user from '@/api/user.js';
export default { export default {
components: { components: {
AQTabber, AQTabber,

2
pages/student/my/personal_data.vue

@ -117,7 +117,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import {Api_url} from "@/common/config.js"; import {Api_url} from "@/common/config.js";
import AQTabber from "@/components/AQ/AQTabber" import AQTabber from "@/components/AQ/AQTabber"

2
pages/student/timetable/index.vue

@ -149,7 +149,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/student/timetable/info.vue

@ -56,7 +56,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

2
pages/student/timetable/list.vue

@ -59,7 +59,7 @@
</template> </template>
<script> <script>
import user from '@/api/user.js'; // import user from '@/api/user.js';
import AQTabber from "@/components/AQ/AQTabber.vue" import AQTabber from "@/components/AQ/AQTabber.vue"

Loading…
Cancel
Save