updated

components/views/cm-simple-swiper/cm-simple-swiper.vue

@@ -82,7 +82,6 @@ export default {
         // 真正渲染的列表
         mapList() {
             const result = this.formatSwiperList(this.data)
-            console.log(result)
             return result
         },
         // 宽

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "caimei-applets-store",
-    "appid" : "__UNI__D9A6E2D",
+    "appid" : "__UNI__EB7B2CD",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/tabBar/cart/cart.vue

@@ -25,7 +25,7 @@
                             删除
                         </tui-button>
                     </view>
-                    <view class="receive-coupon">
+<!--                    <view class="receive-coupon">
                         <view class="tip-text" v-text="couponTipText"></view>
                         <tui-button
                             :size="24"
@@ -37,7 +37,7 @@
                         >
                             领券
                         </tui-button>
-                    </view>
+                    </view> -->
                 </view>
             </template>
 
@@ -238,9 +238,9 @@ export default {
 
         // 提交订单
         onSumit() {
-            return uni.navigateTo({
-                url:'/pages/views/goods/Update-Maintenance'
-            }) 
+            // return uni.navigateTo({
+            //     url:'/pages/views/goods/Update-Maintenance'
+            // }) 
             if (this.checkedProductList.length <= 0) {
                 return this.$toast.error('请选择商品')
             }

pages/views/cart/cart.vue

@@ -27,7 +27,7 @@
                         删除
                     </tui-button>
                 </view>
-                <view class="receive-coupon">
+                <!-- <view class="receive-coupon">
                     <view class="tip-text" v-text="couponTipText"></view>
                     <tui-button
                         :size="24"
@@ -39,7 +39,7 @@
                     >
                         领券
                     </tui-button>
-                </view>
+                </view> -->
             </template>
         </view>
         <!-- 购物车列表为空 -->
@@ -259,9 +259,9 @@ export default {
 
         // 提交订单
         onSumit() {
-            return uni.navigateTo({
-                url:'/pages/views/goods/Update-Maintenance'
-            })
+            // return uni.navigateTo({
+            //     url:'/pages/views/goods/Update-Maintenance'
+            // })
             if (this.checkedProductList.length <= 0) {
                 return this.$toast.error('请选择商品')
             }

pages/views/goods/goods-detail.vue

@@ -132,7 +132,7 @@
 </template>
 
 <script>
-import uParse from '@/components/uni/uParse/src/wxParse'
+import uParse from './uParse/src/wxParse.vue'
 import { debounce } from '@/common/utils.js'
 import { shareDataResult } from '@/common/share.helper.js'
 import { queryStringify } from '@/common/utils.js'
@@ -268,9 +268,9 @@ export default {
 
         // 商品提交
         onSubmit(detail) {
-            return uni.navigateTo({
-                url:'/pages/views/goods/Update-Maintenance'
-            })
+            // return uni.navigateTo({
+            //     url:'/pages/views/goods/Update-Maintenance'
+            // })
             // 用户未登录
             if (!this.userId) {
                 const pages = getCurrentPages()

pages/views/order/components/order-contror/order-contror.vue

@@ -27,9 +27,9 @@ export default {
             mapState: {
                 fightDetail: [82, 83],
                 fightShare: [81],
-                query: [4, 5, 12, 13, 33, 22, 23, 32, 77, 83],
-                delete: [6],
-                cancel: [0, 111],
+                query: [2, 3, 4, 5, 12, 13, 33, 22, 23, 32, 77, 83],
+                delete: [4, 6],
+                cancel: [0, 1, 111],
                 confirm: [33, 83],
                 again: [33],
                 pay: [11, 12, 13, 21, 22, 23, 111]

pages/views/order/components/order-information/order-information.vue

@@ -5,38 +5,38 @@
             <view class="col">
                 <view class="label">订单编号：</view>
                 <view class="content">
-                    <text>{{ orderInfo.orderNo }}</text>
+                    <text>{{ orderInfo.shopOrderList[0].shopOrderNo }}</text>
                     <text class="copy" @click="copyOrderNum">复制</text>
                 </view>
             </view>
         </view>
-        <view class="row">
+        <!-- <view class="row">
             <view class="col">
                 <view class="label">订单总额：</view>
                 <view class="content">¥{{ orderInfo.payTotalFee | priceFormat }}</view>
             </view>
-        </view>
+        </view> -->
         <view class="row">
             <view class="col">
                 <view class="label">下单时间：</view>
                 <view class="content">{{ orderInfo.orderTime }}</view>
             </view>
-            <view class="col">
+            <!-- <view class="col">
                 <view class="label">运费：</view>
                 <view class="content">包邮</view>
-            </view>
+            </view> -->
         </view>
         <view class="row">
             <view class="col" v-if="orderInfo.receiptDate">
                 <view class="label">支付时间：</view>
                 <view class="content">{{ orderInfo.receiptDate }}</view>
             </view>
-            <view class="col">
+<!--            <view class="col">
                 <view class="label">分享减免：</view>
                 <view class="content">¥{{ orderInfo.reductionAmount | priceFormat }}</view>
-            </view>
+            </view> -->
         </view>
-        <view class="row">
+        <!-- <view class="row">
             <view class="col" v-if="orderInfo.couponAmount">
                 <view class="label">优惠券：</view>
                 <view class="content">¥{{ orderInfo.couponAmount | priceFormat }}</view>
@@ -45,7 +45,7 @@
                 <view class="label">已退货/已取消：</view>
                 <view class="content">{{ orderInfo.returnedNum }}/{{ orderInfo.actualCancelNum }}</view>
             </view>
-        </view>
+        </view> -->
     </view>
 </template>
 
@@ -56,13 +56,17 @@ export default {
         orderInfo: {
             type: Object,
             default: () => {}
+        },
+        shopOrderList: {
+            type: Array,
+            default: () => []
         }
     },
 
     methods: {
         copyOrderNum() {
             uni.setClipboardData({
-                data: this.orderInfo.orderNo,
+                data: this.shopOrderList[0].shopOrderNo,
                 success: () => {
                     this.$toast.success('复制成功')
                 },

pages/views/order/components/order-supplier-area/order-supplier-area.vue

@@ -4,6 +4,10 @@
         <view class="area-top">
             <image class="shop-logo" :src="shopData.logo" mode="widthFix"></image>
             <view class="shop-name" v-text="shopData.name"></view>
+            <view class="order-status" v-if="isShowState">
+                <text>{{ stateExpFormat(shopData.shopStatus) }}</text>
+                <!-- <text>{{ stateExpFormat(shopData.shopStatus) }}</text> -->
+            </view>
         </view>
         <!-- 商品列表 -->
         <view class="product" v-for="product in shopData.productList" :key="product.productId">
@@ -14,9 +18,11 @@
 
 <script>
 // import OrderProduct from '../order-product/order-product.vue'
+import orderList from '../../mixins/orderList.js'
 
 export default {
     name: 'order-supplier-area',
+    mixins: [orderList],
     props: {
         shopInfo: {
             type: Object,
@@ -25,6 +31,10 @@ export default {
         submitType: {
             type: String,
             default: 'cart'
+        },
+        isShowState: { // 是否显示订单状态
+            type: Boolean,
+            default: false
         }
     },
     computed: {
@@ -32,7 +42,8 @@ export default {
             return {
                 logo: this.shopInfo.logo || this.shopInfo.shopLogo,
                 name: this.shopInfo.name || this.shopInfo.shopName,
-                productList: this.shopInfo.productList || this.shopInfo.orderProductList
+                productList: this.shopInfo.productList || this.shopInfo.orderProductList,
+                shopStatus: this.shopInfo.shopStatus
             }
         },
         numType() {
@@ -51,6 +62,7 @@ export default {
 .order-supplier-area {
     background-color: #fff;
     .area-top {
+        position: relative;
         @extend .cm-flex-between;
         justify-content: flex-start;
         margin-bottom: 24rpx;
@@ -65,6 +77,12 @@ export default {
             color: #333333;
             font-weight: bold;
         }
+        .order-status {
+            position: absolute;
+            right: 0;
+            color: #FF457B;
+            font-size: 26rpx;
+        }
     }
 
     .product {

pages/views/order/mixins/orderList.js

@@ -15,9 +15,9 @@ const orderList = {
     methods: {
         // 操作订单
         handleConfirmClick(e) {
-            return uni.navigateTo({
-                url:'/pages/views/goods/Update-Maintenance'
-            })
+            // return uni.navigateTo({
+            //     url:'/pages/views/goods/Update-Maintenance'
+            // })
             const { type, order } = (this.hanldOrder = e)
             switch (type) {
                 // 其他操作
@@ -154,11 +154,17 @@ const orderList = {
         //订单状态文字
         stateExpFormat(status) {
             const stateTextObject = {
-                4: '交易完成',
-                5: '订单完成',
-                6: '已关闭',
-                7: '交易全退',
-                77: '交易全退',
+                0: '待确认',
+                1: '已确认',
+                2: '交易完成',
+                3: '订单完成',
+                // 4: '交易完成',
+                // 5: '订单完成',
+                4: '已关闭',
+                5: '交易全退',
+                // 6: '已关闭',
+                // 7: '交易全退',
+                // 77: '交易全退',
                 11: '待付款待发货',
                 12: '待付款部分发货',
                 13: '待付款已发货',

pages/views/order/order-create.vue

@@ -14,6 +14,14 @@
                         :submitType="submitType"
                         @countChange="onCountChange"
                     ></order-supplier-area>
+                    <view class="section_postage">
+                        <view class="postText">
+                            运费：
+                        </view>
+                        <view class="postAgeFlag">
+                            包邮
+                        </view>
+                    </view>
                     <view class="comment">
                         <text>留言：</text>
                         <input placeholder="请输入内容" placeholder-class="placeholder" v-model="shopInfo.note" />
@@ -22,16 +30,16 @@
                 </view>
             </view>
             <!-- 优惠券 -->
-            <view class="cell-section" @click="couponVisiable = true" v-if="receiveCouponList.length > 0">
+<!--            <view class="cell-section" @click="couponVisiable = true" v-if="receiveCouponList.length > 0">
                 <tui-list-cell :arrow="true" :padding="cellPadding" :unlined="true">
                     <view class="cell-content">
                         <text class="label">优惠券</text>
                         <text class="reduce tip">-￥{{ couponAmount | priceFormat }}</text>
                     </view>
                 </tui-list-cell>
-            </view>
+            </view> -->
             <!-- 分享减免 -->
-            <view class="cell-section" @click="onShare" v-if="reduction">
+<!--            <view class="cell-section" @click="onShare" v-if="reduction">
                 <tui-list-cell :arrow="false" :padding="cellPadding" :unlined="true">
                     <button class="cell-content share-btn">
                         <text v-if="!shareStatus" class="active label">
@@ -42,16 +50,16 @@
                         <text class="active" v-else>-￥{{ reduction.reducedAmount | priceFormat }}</text>
                     </button>
                 </tui-list-cell>
-            </view>
+            </view> -->
             <!-- 运费 -->
-            <view class="cell-section">
+            <!-- <view class="cell-section">
                 <tui-list-cell :arrow="false" :padding="cellPadding" :unlined="true">
                     <view class="cell-content">
                         <text class="label">运费</text>
                         <text class="tip postage">免邮</text>
                     </view>
                 </tui-list-cell>
-            </view>
+            </view> -->
         </simple-safe-view>
         <!-- 提交订单 -->
         <order-submit
@@ -499,8 +507,16 @@ export default {
     .shop-list {
         background-color: #fff;
         padding: 24rpx;
-
         .section {
+            .section_postage {
+                @extend .cm-flex-between;
+                font-size: 24rpx;
+                margin: 30rpx 0;
+                .postAgeFlag {
+                    font-weight: bold;
+                    color: #2398FF;
+                }
+            }
             .comment {
                 @extend .cm-flex-between;
                 margin-top: 24rpx;

pages/views/order/order-detail.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="order-detail">
         <view class="order-top sticky-top">
-            <view class="order-status">{{ stateExpFormat(orderInfo.status) }}</view>
+            <view class="order-status" v-if="shopOrderList.length > 0">{{ stateExpFormat(shopOrderList[0].shopStatus) }}</view>
             <!-- 收货地址 -->
             <order-choose-address :addressInfo="userInfo" :disabled="true"></order-choose-address>
         </view>
@@ -9,45 +9,53 @@
         <view class="return-instructions" v-if="returnGoodsStutas" v-html="helpContent"></view>
         <!-- 订单商品列表-->
         <view class="shop-list">
-            <view class="shop-section" v-for="shopInfo in shopOrderList" :key="shopInfo.shopId">
+            <view class="shop-section" v-for="shopInfo in orderInfo.shopOrderList" :key="shopInfo.shopId">
                 <order-supplier-area :shopInfo="shopInfo"></order-supplier-area>
-                <tui-divider :height="48"></tui-divider>
+                <!-- <tui-divider :height="48"></tui-divider> -->
                 <!-- 商品统计 -->
-                <!-- <view class="total">
+<!--                <view class="total">
                     <view class="count">共{{ shopInfo.itemCount }}件商品</view>
                     <view class="price">
                         <text class="label">商品总额：</text>
                         <text>￥{{ shopInfo.totalAmount | priceFormat }}</text>
                     </view>
                 </view> -->
-                <view class="remark">
-                    <text class="label">留言：</text>
+                <view class="remark" v-if="shopInfo.note">
+                    <text class="label" style="color: #999999;">留言：</text>
                     <text class="content">{{ shopInfo.note }}</text>
                 </view>
                 <tui-divider :height="48"></tui-divider>
                 <view class="description">
+                    <view class="row">
+                        <text class="label">商品总额：</text>
+                        <text class="content active">￥{{ shopInfo.needPayAmount | priceFormat }}</text>
+                    </view>
                     <view class="collapse-content" v-if="isCollapse">
                         <view class="row">
-                            <text class="label">商品总额：</text>
-                            <text class="content">￥{{ shopInfo.needPayAmount | priceFormat }}</text>
+                            <text class="label">运费：</text>
+                            <text class="content">包邮</text>
                         </view>
                         <view class="row">
+                            <text class="label">订单总额：</text>
+                            <text class="content">￥{{ shopInfo.realPay | priceFormat }}</text>
+                        </view>
+                        <!-- <view class="row">
                             <text class="label">优惠：</text>
                             <text class="content">￥{{ shopInfo.eachDiscount | priceFormat }}</text>
                         </view>
                         <view class="row">
                             <text class="label">应付金额：</text>
                             <text class="content">￥{{ shopInfo.realPay | priceFormat }}</text>
-                        </view>
+                        </view> -->
                         <view class="row">
                             <text class="label">已付金额：</text>
                             <text class="content">￥{{ shopInfo.receiptAmount | priceFormat }}</text>
                         </view>
                     </view>
-                    <view class="row">
+                    <!-- <view class="row">
                         <text class="label active">待付金额：</text>
                         <text class="content active">￥{{ shopInfo.restAmount | priceFormat }}</text>
-                    </view>
+                    </view> -->
                     <view class="collapse" :class="isCollapse ? 'arrowup' : 'arrowdown'" @click="onCollapse">
                         {{ isCollapse ? '收起' : '展开' }}
                     </view>
@@ -55,7 +63,7 @@
             </view>
         </view>
         <!-- 订单详细信息 -->
-        <order-information :orderInfo="orderInfo"></order-information>
+        <order-information :orderInfo="orderInfo" :shopOrderList="shopOrderList"></order-information>
         <!-- 底部操作按钮 -->
         <view class="control fixed-bottom" v-if="orderInfo.userId == userId">
             <simple-safe-view>
@@ -196,7 +204,7 @@ export default {
         font-size: 26rpx;
         color: #333333;
         padding: 0 24rpx;
-        margin: 8rpx 0;
+        margin-top: 30rpx;
     }
     .description {
         overflow: hidden;

pages/views/order/order-list.vue

@@ -44,7 +44,7 @@
                             @click="handleToDetail(orderInfo)"
                         >
                             <!-- 订单信息 -->
-                            <view class="order-info">
+<!--                            <view class="order-info">
                                 <view class="order-no">
                                     <text class="label">订单编号：</text> <text>{{ orderInfo.orderNo }}</text>
                                 </view>
@@ -52,8 +52,8 @@
                                     <text class="label">下单时间：</text> <text>{{ orderInfo.orderTime }}</text>
                                 </view>
                                 <view class="order-status">{{ stateExpFormat(orderInfo.status) }}</view>
-                            </view>
-                            <tui-divider :height="48"></tui-divider>
+                            </view> -->
+                            <!-- <tui-divider :height="48"></tui-divider> -->
                             <!-- 商品列表 -->
                             <view class="shop-list">
                                 <view
@@ -61,7 +61,7 @@
                                     v-for="shopInfo in orderInfo.shopOrderList"
                                     :key="shopInfo.shopOrderId"
                                 >
-                                    <order-supplier-area :shopInfo="shopInfo"></order-supplier-area>
+                                    <order-supplier-area :shopInfo="shopInfo" :is-show-state="true"></order-supplier-area>
                                 </view>
                             </view>
                             <!-- 商品统计 -->

pages/views/order/order-pay.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="order-pay">
-        <view class="top-tip">请对每家店铺分别进行付款</view>
+        <!-- <view class="top-tip">请对每家店铺分别进行付款</view> -->
         <template v-for="order in orderList">
             <view class="shop-info" :key="order.shopId">
                 <view class="shop-name">{{ order.shopName }}</view>
@@ -114,9 +114,9 @@ export default {
         },
         // 确认支付
         handleModalConfirm(e) {
-            return uni.navigateTo({
-                url:'/pages/views/goods/Update-Maintenance'
-            })
+            // return uni.navigateTo({
+            //     url:'/pages/views/goods/Update-Maintenance'
+            // })
             this.modal = false
             if (!e.index) return
             this.miniWxPayFor(this.orderInfo)

services/config.env.js

@@ -2,6 +2,7 @@ export let APP_API_URI = ''
 if (process.env.NODE_ENV === 'development') {
     // 开发环境
     // APP_API_URI = 'http://192.168.2.67:8011'	 //本地联调地址
+    // APP_API_URI = 'http://192.168.2.103:8011' // 陈凯联调
     APP_API_URI = 'https://mall2c-b.caimei365.com'
     // APP_API_URI = 'https://core-b.caimei365.com'
     // APP_API_URI = 'https://mall2c.caimei365.com'