maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:e9488a27770e9397248b7770d9f3caa9e92a6f53
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:08d3c6bab08a173c822dcb7f2013fba2b6f72bdb
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "e9488a27770e9397248b7770d9f3caa9e92a6f53" and "08d3c6bab08a173c822dcb7f2013fba2b6f72bdb" have entirely different histories.
e9488a2777 ... 08d3c6bab0

4 changed files with 12 additions and 32 deletions
Show Stats Expand all files Collapse all files

7
packages/myOrders/awaitRated/awaitRated.vue
View File

@ -7,7 +7,7 @@
</view> </view>
<view class="product-list"> <view class="product-list">
<view class="product-item" v-for="(product, pIndex) in item.commodity_order_item_list" :key="pIndex"> <view class="product-item" v-for="(product, pIndex) in item.commodity_order_item_list" :key="pIndex">
<view class="product-info" @click="toDetail(item)"> <view class="product-info">
<view class="product-img"> <view class="product-img">
<image :src="product.commodity_pic"></image> <image :src="product.commodity_pic"></image>
<view class="tag" v-if="product.is_same_day === 1">当日达</view> <view class="tag" v-if="product.is_same_day === 1">当日达</view>
@ -43,11 +43,6 @@ export default {
}; };
}, },
methods: { methods: {
toDetail(item) {
const goodId = item.commodity_order_item_list[0].goods_id
const orderInfo = item
NavgateTo(`/packages/myOrders/goodDetails/index?item=${JSON.stringify(orderInfo)} &goodId=${JSON.stringify(goodId)}`);
},
evaluateOrder(item) { evaluateOrder(item) {
NavgateTo(`../evaluate/index?item=${JSON.stringify(item)}`); NavgateTo(`../evaluate/index?item=${JSON.stringify(item)}`);
}, },

21
packages/myOrders/rated/rated.vue
View File

@ -13,19 +13,16 @@
<view class="evaluation-area"> <view class="evaluation-area">
<text class="evaluation-text">{{ item.evaluate_info.user_review }}</text> <text class="evaluation-text">{{ item.evaluate_info.user_review }}</text>
<!-- 评价图片区域 --> <!-- 评价图片区域 -->
<view class="image-list" <view class="image-list" v-if="item.evaluate_info.review_image && item.evaluate_info.review_image.length > 0">
v-if="item.evaluate_info.review_image && item.evaluate_info.review_image.length > 0"> <view class="image-item" v-for="(img, index) in parseReviewImages(item.evaluate_info.review_image)" :key="index">
<view class="image-item" v-for="(img, index) in parseReviewImages(item.evaluate_info.review_image)" <image :src="img" @tap="previewImage(parseReviewImages(item.evaluate_info.review_image), index)"></image>
:key="index">
<image :src="img" @tap="previewImage(parseReviewImages(item.evaluate_info.review_image), index)">
</image>
</view> </view>
</view> </view>
<text class="order-date">{{ item.evaluate_info.create_time }}</text> <text class="order-date">{{ item.evaluate_info.create_time }}</text>
</view> </view>
<!-- 商品信息区域 --> <!-- 商品信息区域 -->
<view class="product-info" @click="toDetail(item)"> <view class="product-info">
<view class="product-img"> <view class="product-img">
<image :src="item.commodity_order_item_list[0].commodity_pic"></image> <image :src="item.commodity_order_item_list[0].commodity_pic"></image>
<view class="tag" v-if="item.commodity_order_item_list[0].is_same_day === 1" :key="index">当日达</view> <view class="tag" v-if="item.commodity_order_item_list[0].is_same_day === 1" :key="index">当日达</view>
@ -33,8 +30,7 @@
<view class="product-details"> <view class="product-details">
<text class="product-name">{{ item.commodity_order_item_list[0].goods_name }}</text> <text class="product-name">{{ item.commodity_order_item_list[0].goods_name }}</text>
<text class="product-spec">{{ item.commodity_order_item_list[0].goods_spec }}</text> <text class="product-spec">{{ item.commodity_order_item_list[0].goods_spec }}</text>
<text class="product-unit">{{ item.commodity_order_item_list[0].sales_price }}/{{ <text class="product-unit">{{ item.commodity_order_item_list[0].sales_price }}/{{ item.commodity_order_item_list[0].goods_unit }}</text>
item.commodity_order_item_list[0].goods_unit }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -44,8 +40,6 @@
</template> </template>
<script> <script>
import { picUrl, NavgateTo, request } from "../../../utils";
export default { export default {
props: { props: {
orderData: { orderData: {
@ -59,11 +53,6 @@ export default {
}; };
}, },
methods: { methods: {
toDetail(item) {
const goodId = item.commodity_order_item_list[0].goods_id
const orderInfo = item
NavgateTo(`/packages/myOrders/goodDetails/index?item=${JSON.stringify(orderInfo)} &goodId=${JSON.stringify(goodId)}`);
},
// 预览图片 // 预览图片
previewImage(imageList, currentIndex) { previewImage(imageList, currentIndex) {
uni.previewImage({ uni.previewImage({

8
packages/shop/groupPurchase/index.vue
View File

@ -210,13 +210,9 @@ export default {
}); });
}, },
toDetail(itemObj) { toDetail(itemObj) {
let targetItem = itemObj;
if(!targetItem.group_buy_activity_info && targetItem.group_buy_goods_list && targetItem.group_buy_goods_list.length > 0){
targetItem = targetItem.group_buy_goods_list[0];
}
const item = { const item = {
...targetItem, ...itemObj,
groupById: targetItem.group_buy_activity_info.id groupById: itemObj.group_buy_activity_info.id
}; };
NavgateTo(`/packages/shop/groupPurchaseDetail/index?item=${JSON.stringify(item)}`) NavgateTo(`/packages/shop/groupPurchaseDetail/index?item=${JSON.stringify(item)}`)
}, },

2
packages/workOrderDashboard/guide/index.css
View File

@ -83,7 +83,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
/* border: 1rpx solid #f7f7f7; */ border: 1rpx solid #f7f7f7;
} }
.work-order-icon { .work-order-icon {