feature/v-xuexi
wangdong 8 months ago
parent a1d59f779b
commit 6746c0b293
  1. 2
      manifest.json
  2. 4
      pages/merchant/teacher_detail.vue
  3. 4
      pages/special/grade_special.vue
  4. 13
      pages/special/order_store_list.vue
  5. 8
      pages/special/record.vue

@ -1,6 +1,6 @@
{ {
"name" : "梦航教育宝", "name" : "梦航教育宝",
"appid" : "__UNI__AB67F73", "appid" : "__UNI__640EC10",
"description" : "1.1", "description" : "1.1",
"versionName" : "1.0.1", "versionName" : "1.0.1",
"versionCode" : 101, "versionCode" : 101,

@ -8,10 +8,10 @@
<image :src="lecturer.lecturer_head" /> <image :src="lecturer.lecturer_head" />
<view class="con"> <view class="con">
<view class="name"> <view class="name">
{{ lecturer.lecturer_name }} {{ lecturer.lecturer_name || '' }}
</view> </view>
<view v-if="lecturer.explain" class="info">{{ lecturer.explain }}</view> <view v-if="lecturer.explain" class="info">{{ lecturer.explain || '' }}</view>
<!-- <navigator v-if="merId === lecturer.mer_id && lecturer.mer_id" <!-- <navigator v-if="merId === lecturer.mer_id && lecturer.mer_id"
:url="`/pages/merchant/info?mer_id=${lecturer.mer_id}&type=1`" hover-class="none" class="info-btn"> :url="`/pages/merchant/info?mer_id=${lecturer.mer_id}&type=1`" hover-class="none" class="info-btn">
查看信息 查看信息

@ -139,11 +139,11 @@ export default {
color: #999999; color: #999999;
} }
.list { .list {
position: absolute; position: relative;
left: 0; left: 0;
right: 0; right: 0;
margin: 0 auto; margin: 0 auto;
margin-top: calc(128rpx + var(--safe-top)); margin-top: calc(88rpx + var(--safe-top));
width: 686rpx; width: 686rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;

@ -92,7 +92,7 @@
</template> </template>
<script> <script>
import { getOrderCountByStatus, getUserOrderList, userTakeOrder } from "@/api/auth"; import { getOrderCountByStatus, getUserOrderList, userTakeOrder, userRemoveOrder } from "@/api/auth";
import { getSpecialTemplateIds, getInitData, aliPayApp, aliPayWap } from "@/api/special"; import { getSpecialTemplateIds, getInitData, aliPayApp, aliPayWap } from "@/api/special";
import PayDialog from "@/components/PayDialog/index.vue"; import PayDialog from "@/components/PayDialog/index.vue";
@ -373,10 +373,19 @@
if (!confirm) return; if (!confirm) return;
uni.showLoading({ mask: true }); uni.showLoading({ mask: true });
try { try {
await userRemoveOrder(this.id); await userRemoveOrder(id);
uni.hideLoading(); uni.hideLoading();
this.$util.showMsg(title + "成功!"); this.$util.showMsg(title + "成功!");
this.orderList = {
first: 0,
limit: 8,
list: [],
loaded: false,
top: 0,
};
this.getOrderList();
} catch (err) { } catch (err) {
console.log(err);
uni.hideLoading(); uni.hideLoading();
this.$util.showMsg(err.msg); this.$util.showMsg(err.msg);
} }

@ -194,7 +194,10 @@ page{
right: 0; right: 0;
width: 686rpx; width: 686rpx;
margin: 0 auto; margin: 0 auto;
margin-top: calc(330rpx + var(--safe-top)); margin-top: calc(240rpx + var(--safe-top));
// #ifdef MP-WEIXIN
margin-top: calc(280rpx + var(--safe-top));
// #endif
border-radius: 24rpx; border-radius: 24rpx;
z-index: 999; z-index: 999;
@ -239,9 +242,10 @@ page{
padding-bottom: 40rpx; padding-bottom: 40rpx;
width: 686rpx; width: 686rpx;
margin: 0 auto; margin: 0 auto;
margin-top: calc(210rpx + var(--safe-top)); margin-top: calc(170rpx + var(--safe-top));
border-radius: 24rpx; border-radius: 24rpx;
z-index: 999; z-index: 999;
position: relative;
} }
.study-record .goods .item { .study-record .goods .item {

Loading…
Cancel
Save