root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

master
wangfukang 4 weeks ago
parent
bed053bcc3 a52efeb8d8
commit
c9dc0c0872
4 changed files with 83 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 143
      package1/group/shopEvaluate.vue
  2. 2
      package1/myCenter/goodsList.vue
  3. 4
      package2/shop/merchantCenter.vue
  4. 7
      pages/index/index.vue

143
package1/group/shopEvaluate.vue
View File

@ -34,83 +34,86 @@
</view> </view>
</view> </view>
</view> </view>
<view class="evaluate-list" v-for="(item,index) in shopComments" :key="index"> <scroll-view scroll-y @scrolltolower="onReachPage" style="width:100%;height: 540px;overflow: scroll;">
<view class="eval-title"> <view v-for="(item,index) in shopComments" :key="index">
<view class="eval-icon"> <view class="eval-title">
<img :src="item.createByIcon" <view class="eval-icon">
alt="" /> <img :src="item.createByIcon"
</view> alt="" />
<view class="eval-name">
<view class="name1">
{{item.createByName}}
</view> </view>
<view class="eval-time"> <view class="eval-name">
{{item.createTime | formatTime}} <view class="name1">
</view> {{item.createByName}}
</view>
</view>
<view class="eval-content">
<view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;">
商品
<view style="padding: 12rpx 0 0 10rpx;">
<uni-rate v-model="item.score" size="12" />
</view>
</view>
<view class="eval-text">
{{item.remark}}
</view>
<view class="eval-img" v-if="item.picture">
<img @tap="largeImg" :src="item.picture" alt="">
</view>
<view class="reply-card" v-for="(item1,index1) in item.comments" :key="index1" :class="{'expanded': item1.isOpen}">
<!-- 标题行：商家回复 + 展开/收起按钮 -->
<view class="reply-header">
<!-- 回复内容区域（动态类控制展开/折叠） -->
<view class="reply-content" :class="{ collapsed: !item1.isOpen, expanded: item1.isOpen }">
<text>{{item1.createByName}} : {{ item1.remark }}</text>
<img :src="item1.picture" v-if="item1.picture" alt="" class="upload-img" style="margin-top: 10px;border-radius: 10px;">
</view> </view>
<view class="reply-expand-btn" @click="toggleReply(index,index1)"> <view class="eval-time">
<text v-if="!item1.isOpen">展开</text> {{item.createTime | formatTime}}
<text v-else>收起</text>
</view> </view>
</view> </view>
</view> </view>
<view class="" v-if="(isMerchant == 1 || isMerchant == 2)"> <view class="eval-content">
<view @tap="changeStatus(index)" class="reply-card" v-if="!item.isReply" style="text-align: right;padding-right: 10px;color: #00BFFF;"> <view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;">
回复 商品
<view style="padding: 12rpx 0 0 10rpx;">
<uni-rate :disabled="true" disabledColor="rgba(255, 184, 84, 1)" :value="item.score" size="12" />
</view>
</view> </view>
<view class="" v-else> <view class="eval-text">
<view class="" style="background: #f5f5f5;border-radius: 10px;border: 1px solid #777;margin-top: 10px;"> {{item.remark}}
<view class="eval-num" style="border: none;"> </view>
<textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗？可以写下来，提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea> <view class="eval-img" v-if="item.picture">
<img @tap="largeImg" :src="item.picture" alt="">
</view>
<view class="reply-card" v-for="(item1,index1) in item.comments" :key="index1" :class="{'expanded': item1.isOpen}">
<!-- 标题行：商家回复 + 展开/收起按钮 -->
<view class="reply-header">
<!-- 回复内容区域（动态类控制展开/折叠） -->
<view class="reply-content" :class="{ collapsed: !item1.isOpen, expanded: item1.isOpen }">
<text>{{item1.createByName}} : {{ item1.remark }}</text>
<img :src="item1.picture" v-if="item1.picture" alt="" class="upload-img" style="margin-top: 10px;border-radius: 10px;">
</view>
<view class="reply-expand-btn" @click="toggleReply(index,index1)">
<text v-if="!item1.isOpen">展开</text>
<text v-else>收起</text>
</view> </view>
<view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;"> </view>
<view class="upload-img" @tap="pictureAdd()" </view>
style="background: #f5f5f5;text-align: center;line-height: 160rpx;"> <view class="" v-if="(isMerchant == 1 || isMerchant == 2)">
<uni-icons type="camera" size="28" color="#777"></uni-icons> <view @tap="changeStatus(index)" class="reply-card" v-if="!item.isReply" style="text-align: right;padding-right: 10px;color: #00BFFF;">
回复
</view>
<view class="" v-else>
<view class="" style="background: #f5f5f5;border-radius: 10px;border: 1px solid #777;margin-top: 10px;">
<view class="eval-num" style="border: none;">
<textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗？可以写下来，提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea>
</view> </view>
<view style="flex: 1;display: flex;"> <view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;">
<view v-if="replyPicture !=''" <view class="upload-img" @tap="pictureAdd()"
:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;"> style="background: #f5f5f5;text-align: center;line-height: 160rpx;">
<img :src="replyPicture" alt="" class="upload-img"> <uni-icons type="camera" size="28" color="#777"></uni-icons>
</view>
<view style="flex: 1;display: flex;">
<view v-if="replyPicture !=''"
:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
<img :src="replyPicture" alt="" class="upload-img">
</view>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- <textarea type="text" v-model="replyText" placeholder="要说什么写下来吧" style="background: #eee;border-radius: 10px;height: 100px;margin: 10px 0;padding: 10px;" /> -->
<!-- <textarea type="text" v-model="replyText" placeholder="要说什么写下来吧" style="background: #eee;border-radius: 10px;height: 100px;margin: 10px 0;padding: 10px;" /> --> <view class="" style="display: flex;flex-direction: row-reverse;padding-right: 10px;margin-top: 10px;">
<view class="" style="display: flex;flex-direction: row-reverse;padding-right: 10px;margin-top: 10px;"> <view @tap="submit(index)" class="" style="margin-left: 20px;color: #00BFFF;">
<view @tap="submit(index)" class="" style="margin-left: 20px;color: #00BFFF;"> 确认
确认 </view>
</view> <view class="" @tap="changeStatus(index)">
<view class="" @tap="changeStatus(index)"> 取消
取消 </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view>
</scroll-view>
<view style="width: 100%;height: 100rpx;"></view> <view style="width: 100%;height: 100rpx;"></view>
</view> </view>
<!-- 查看大图弹出层 --> <!-- 查看大图弹出层 -->
@ -133,7 +136,6 @@
isPintuan: true, isPintuan: true,
bigImg: '', bigImg: '',
shopItem:{}, shopItem:{},
pageNum:1,
searchAll:true, searchAll:true,
total:0, total:0,
shopComments:[], shopComments:[],
@ -209,7 +211,7 @@
this.searchForm.shopId = id this.searchForm.shopId = id
that.tui.request("/app/comment/getCommentList", "POST", this.searchForm, false, false).then((res) => { that.tui.request("/app/comment/getCommentList", "POST", this.searchForm, false, false).then((res) => {
if (res.code == 200) { if (res.code == 200) {
if (that.pageNum == 1) { if (that.searchForm.pageNum == 1) {
that.shopComments = res.result.records that.shopComments = res.result.records
} else { } else {
that.shopComments = [...that.shopComments, ...res.result.records] that.shopComments = [...that.shopComments, ...res.result.records]
@ -222,6 +224,7 @@
} }
} }
} }
that.total = res.result.pages; // pages = 总页数
that.$forceUpdate() that.$forceUpdate()
if(this.searchAll){ if(this.searchAll){
that.menuList[0].num = res.result.total that.menuList[0].num = res.result.total
@ -233,6 +236,12 @@
uni.hideLoading() uni.hideLoading()
}).catch((res) => {}) }).catch((res) => {})
}, },
onReachPage(){
console.log("11111")
if (this.searchForm.pageNum >= this.total) return;
this.searchForm.pageNum++;
this.getshopComments(this.shopItem.id);
},
submit(v){ submit(v){
let that = this; let that = this;
let data = [{ //店铺 let data = [{ //店铺
@ -290,6 +299,8 @@
this.searchForm.picture = 0 this.searchForm.picture = 0
this.searchForm.score = 1 this.searchForm.score = 1
} }
this.searchForm.pageNum = 1
this.shopComments = []
this.getshopComments(this.shopItem.id) this.getshopComments(this.shopItem.id)
}, },
pictureAdd() { pictureAdd() {
@ -443,7 +454,7 @@
} }
.menu-list { .menu-list {
height: 100rpx; height: 120rpx;
width: 100%; width: 100%;
display: flex; display: flex;
overflow-y: hidden; overflow-y: hidden;
@ -468,10 +479,6 @@
flex: 1; flex: 1;
} }
.evaluate-list {
margin-top: 40rpx;
}
.eval-title { .eval-title {
width: 100%; width: 100%;
height: 80rpx; height: 80rpx;

2
package1/myCenter/goodsList.vue
View File

@ -6,7 +6,7 @@
<view class="back-btn" @tap="back" :style="{'padding-top': menuButtonInfo.top +'px'}"> <view class="back-btn" @tap="back" :style="{'padding-top': menuButtonInfo.top +'px'}">
<uni-icons type="left" size="28"></uni-icons> <uni-icons type="left" size="28"></uni-icons>
</view> </view>
<view class="title-search" :style="{'padding-top': menuButtonInfo.top +'px'}" @tap="goDetail('search')"> <view class="title-search" :style="{'padding-top': menuButtonInfo.top +'px'}">
<uni-icons type="search" size="18" style="margin: 9rpx;"></uni-icons> <uni-icons type="search" size="18" style="margin: 9rpx;"></uni-icons>
<input type="text" placeholder="搜索" @input="search" /> <input type="text" placeholder="搜索" @input="search" />
</view> </view>

4
package2/shop/merchantCenter.vue
View File

@ -126,14 +126,14 @@
商品管理 商品管理
</view> </view>
</view> </view>
<view class="menu22" @tap="goDetail('dp')"> <!-- <view class="menu22" @tap="goDetail('dp')">
<view class="menu33"> <view class="menu33">
<img src="/static/images/dingdan/dd1.png" alt="" /> <img src="/static/images/dingdan/dd1.png" alt="" />
</view> </view>
<view class="menu44"> <view class="menu44">
店铺管理 店铺管理
</view> </view>
</view> </view> -->
<view class="menu22" @tap="goDetail('dd')"> <view class="menu22" @tap="goDetail('dd')">
<view class="menu33"> <view class="menu33">
<img src="/static/images/dingdan/dd2.png" alt="" /> <img src="/static/images/dingdan/dd2.png" alt="" />

7
pages/index/index.vue
View File

@ -827,10 +827,13 @@
url = '/package1/group/groupBuyList' url = '/package1/group/groupBuyList'
break; break;
case '3': case '3':
url = '/package1/order/orderList' url = ''
break; break;
case '4': case '4':
url = '/package1/order/orderDetail' url = ''
break;
case '5':
url = ''
break; break;
} }
uni.navigateTo({ uni.navigateTo({

Write Preview
Loading…
Cancel
Save