admin/.env.development
@@ -1,3 +1,4 @@ # 开发环境配置 NODE_ENV = 'development' VUE_APP_API_URL = 'http://192.168.1.54:10010' #VUE_APP_API_URL = 'http://192.168.1.54:10010' VUE_APP_API_URL = 'https://jinkuai.832smartfarm.com/jinkuai_admin' admin/src/components/business/OperaOrderDetailWindow.vue
@@ -59,15 +59,14 @@ <div class="cont"><span class="label">品种：</span> <span class="txt">{{info.categoryName || ''}}</span></div> </div> <div class="line"> <div class="cont" v-if="info.workType==1"><span class="label">人数：</span> <span class="txt">{{info.priceNum1 || '' }}人</span></div> <div class="cont" v-if="info.workType==0"><span class="label">重量：</span> <span class="txt">{{info.priceNum1 || '' }}斤</span></div> <div class="cont"><span class="label">用工时间：</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div> <div class="cont"><span class="label">用工天数：</span><span class="txt">{{info.totalDays || 0 }}天</span></div> <div class="cont" ><span class="label">用工时间：</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }} （ {{info.totalDays || 0 }} ）天</span></div> <div class="cont"><span class="label">用工地点：</span> <span class="txt">{{info.location || '' }}</span></div> <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}元</span></div> </div> <div class="line"> <div class="cont"><span class="label">用工地点：</span> <span class="txt">{{info.location || '' }}</span></div> <div class="cont"><span class="label">费用标准：</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div> <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}元</span></div> <div class="cont" :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div> <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.originPriceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div> </div> <div class="line"> <div class="cont"><span class="label">地点描述：</span><span class="txt">{{info.locationRemark || '' }}</span></div> @@ -99,9 +98,9 @@ </div> <div class="detail" v-if="info.type==1"> <div class="line"> <div class="cont"><span class="label"> 订单类型：</span> <span class="txt">{{(info.type==0?'用工单':(info.type==1?'货运单':'订单单')) }}</span></div> <div class="cont"><span class="label"> 订单类型：</span> <span class="txt">{{(info.type==0?'用工单':(info.type==1?'货运单':'订餐单')) }}</span></div> <div class="cont"><span class="label">车辆：</span> <span class="txt">{{info.categoryName || ''}}-{{info.carUnit || ''}}</span></div> <div class="cont"><span class="label">用车时间：</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div> <div class="cont"><span class="label">用车时间：</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}（ {{info.totalDays || 0 }} ）天</span></div> </div> <div class="line"> <div class="cont" > <span class="label"> 地址信息：</span> <span class="label" v-if="!wayList || wayList.length==0">-</span> </div> @@ -116,12 +115,12 @@ </div> </div> <div class="line"> <div class="cont"><span class="label">用工天数：</span><span class="txt">{{info.totalDays || 0 }}</span></div> <div class="cont"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div> <div class="cont"><span class="label">运输重量/数量：</span> <span class="txt">{{info.transportNum || '' }}{{info.transportUnit || ''}}</span></div> <div class="cont"><span class="label">费用标准：</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div> </div> <div class="line"> <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}元</span></div> <div class="cont"><span class="label">预估总费用：</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}元</span></div> </div> <div class="line"> <div class="cont" ><span class="label">需求补充：</span><span class="txt">{{info.supplement || '' }}</span></div> @@ -191,8 +190,8 @@ </div> <div class="detail" style=" "> <div class="line"> <div class="cont"><span class="label">实际{{feeFrom.priceParam1.name }}：</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div> <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">实际{{feeFrom.priceParam2.name }}：</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div> <div class="cont"><span class="label">实际{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div> <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">实际{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div> <div class="cont" :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">其他费用：</span> <span class="txt">{{((info.confirmOtherFee||0)/100).toFixed(2) }}元</span></div> </div> <div class="line"> @@ -371,30 +370,30 @@ // 包装工 if (this.info.carType === 0) { // 按天 this.feeFrom.priceParam1.name = '用工天数' this.feeFrom.priceParam1.name = '用工天数：' this.feeFrom.priceParam1.unit = '天' this.feeFrom.priceParam2.name = '用工人数' this.feeFrom.priceParam2.name = '用工人数：' this.feeFrom.priceParam2.unit = '人' } else if (this.info.carType === 1) { // 按小时 this.feeFrom.priceParam1.name = '工作时长' this.feeFrom.priceParam1.name = '工作时长：' this.feeFrom.priceParam1.unit = '时' this.feeFrom.priceParam2.name = '用工人数' this.feeFrom.priceParam2.unit = '人' } else if (this.info.carType === 1) { } else if (this.info.carType === 2) { // 按小时 this.feeFrom.priceParam1.name = '包装重量' this.feeFrom.priceParam1.name = '包装重量：' this.feeFrom.priceParam1.unit = '斤' this.feeFrom.priceParam2.name = null this.feeFrom.priceParam2.unit = null } } else if (this.info.type === 1 && this.info.carType === 0) { // 运货单 按天数 this.feeFrom.priceParam1.name = '用车天数' this.feeFrom.priceParam1.name = '用车天数：' this.feeFrom.priceParam1.unit = '天' } else if (this.info.type === 1 && this.info.carType === 1) { // 运货单 按次数 this.feeFrom.priceParam1.name = '用车次数' this.feeFrom.priceParam1.name = '用车次数：' this.feeFrom.priceParam1.unit = '次' } } server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -261,9 +261,12 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) && ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO) || Constants.equalsInteger(orders.getCarType(),Constants.ONE) )) || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ONE)) if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) && ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO) || Constants.equalsInteger(orders.getCarType(),Constants.ONE) )) || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ONE)) ){ if(Objects.isNull(orders.getPriceNum2())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); @@ -845,8 +848,9 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO )) || Constants.equalsInteger(orders.getType(),Constants.ONE) (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO )) || Constants.equalsInteger(orders.getType(),Constants.ONE) || Constants.equalsInteger(orders.getType(),Constants.TWO) ){ orders.setPriceNum2(Constants.ONE); @@ -855,7 +859,9 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } } BigDecimal bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())).multiply(new BigDecimal(orders.getPriceNum2().toString())); BigDecimal bigDecimalPrice = orders.getPrice(). multiply(new BigDecimal(orders.getPriceNum1().toString())) .multiply(new BigDecimal(orders.getPriceNum2().toString())); return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2(); }
@@ -15,10 +15,10 @@ }) // Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/' Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/' // Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/' // Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/' // Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/' Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/' const app = new Vue({ store, small-program/pages/demand-hall/demand-hall.vue
@@ -60,13 +60,19 @@ {{item.categoryName}}｜{{item.priceNum1}}斤 </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1"> {{item.categoryName}}｜{{item.priceNum1}}人 {{item.categoryName}}｜{{item.priceNum2}}人 </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2"> {{item.categoryName}}｜{{item.priceNum1}}人 <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0"> {{item.categoryName}}｜{{item.priceNum1}}天 ｜{{item.priceNum2}}人 </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1"> {{item.categoryName}}｜{{item.priceNum1}}小时 ｜{{item.priceNum2}}人 </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2"> {{item.categoryName}}｜{{item.priceNum1}}斤 </view> <view class="index-list-item-info" v-if="item.type === 1"> {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}天 {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}{{item.carType === 0?"天":"次"}} </view> <view class="index-list-item-info" v-if="item.type === 2"> {{item.wayInfoCopy}} @@ -90,9 +96,10 @@ <text>{{item.startDate}} 至 {{item.endDate}}（{{item.totalDays}}天）</text> </view> </template> <view class="index-list-item-price"> <text>预估：</text> <text>¥{{item.estimatedAccount / 100}}</text> <view class="index-list-item-price"> <text v-if="item.status==4 || item.type==2">已支付：</text> <text v-if="item.status!=4&& item.type!=2">预估：</text> <text>¥{{item.payAccount / 100}}</text> </view> <view class="eidt"> <view> @@ -127,7 +134,7 @@ <text v-if="item.type === 0 && item.workType === 0">用工单 - 采摘工</text> <text v-else-if="item.type === 0 && item.workType === 1">用工单 - 分拣工</text> <text v-else-if="item.type === 0 && item.workType === 2">用工单 - 包装工</text> <text v-else-if="item.type === 1">运货单</text> <text v-else-if="item.type === 1">运货单 - {{item.categoryName}}</text> <text v-else-if="item.type === 2">订餐单</text> <view class="tips" v-if="item.acceptType === 1">派单</view> <view class="tips1" v-if="item.acceptType === 0">抢单</view> @@ -152,12 +159,9 @@ </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2"> {{item.categoryName}}｜{{item.priceNum1}}斤 </view> </view> <view class="index-list-item-info" v-if="item.type === 1"> {{item.categoryName}}-{{item.carUnit}} </view> <view class="index-list-item-info" v-if="item.type === 1"> {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}天 {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}{{item.carType === 0?"天":"次"}} </view> <view class="index-list-item-info" v-if="item.type === 2"> {{item.wayInfoCopy}} @@ -182,8 +186,9 @@ </view> </template> <view class="index-list-item-price"> <text>预估：</text> <text>¥{{item.estimatedAccount / 100}}</text> <text v-if="item.status==4">已支付：</text> <text v-if="item.status!=4">预估：</text> <text>¥{{item.payAccount / 100}}</text> </view> <view class="eidt"> <view class="eidt-tips" v-if="item.isUpdate === 1"> small-program/pages/freight/freight.vue
@@ -143,14 +143,14 @@ <view class="list-item-row" v-if="form.carType==1"> <view class="list-item-row-label">用车次数<b>*</b></view> <view class="list-item-row-val"> <input type="number" v-model="form.priceNum1" placeholder="请输入" /> <input type="number" v-model="form.priceNum1" @input="getPrice" placeholder="请输入" /> <text>次</text> </view> </view> <view class="list-item-row"> <view class="list-item-row-label">费用标准<b>*</b></view> <view class="list-item-row-val"> <input type="digit" @blur="getPrice" v-model="form.price" placeholder="请输入" /> <input type="digit" @input="getPrice" v-model="form.price" placeholder="请输入" /> <text>{{form.priceUnit}}</text> </view> </view> @@ -307,6 +307,7 @@ } else if (news === 1) { this.form.priceUnit = '元/次' } this.getPrice() } } }, @@ -488,8 +489,9 @@ this.$u.api.getTotal({ price: Number(this.form.price).toFixed(2) * 100, priceUnit: this.form.priceUnit, priceNum1: this.form.priceNum1, priceNum1: this.form.carType!=1?this.form.totalDays:this.form.priceNum1, priceNum2: this.form.priceNum2, carType:this.form.carType , type: 1 }).then(res => { if (res.code === 200) { @@ -541,6 +543,7 @@ let time = this.form.startDate == this.form.endDate ? 1 : 0 this.form.totalDays = e.length - time; this.show2 = false this.getPrice() }, addAddr() { this.form.wayInfoDTOList.push({ small-program/pages/index/index.vue
@@ -21,55 +21,63 @@ </view> <view class="index-j-list"> <view class="index-list-item" v-if="orderList && orderList.length" v-for="(item, index) in orderList" :key="index"> <view class="index-list-item-head"> <view class="index-list-item-head-l"> <view class="xoam"></view> <text v-if="item.type === 0 && item.workType === 0">用工单 - 采摘工</text> <text v-else-if="item.type === 0 && item.workType === 1">用工单 - 分拣工</text> <text v-else-if="item.type === 0 && item.workType === 2">用工单 - 包装工</text> <text v-else-if="item.type === 1">运货单-{{item.categoryName}}</text> <text v-else-if="item.type === 2">订餐单</text> <view @click="goOrderDetail(item.id)"> <view class="index-list-item-head" > <view class="index-list-item-head-l"> <view class="xoam"></view> <text v-if="item.type === 0 && item.workType === 0">用工单 - 采摘工</text> <text v-else-if="item.type === 0 && item.workType === 1">用工单 - 分拣工</text> <text v-else-if="item.type === 0 && item.workType === 2">用工单 - 包装工</text> <text v-else-if="item.type === 1">运货单-{{item.categoryName}}</text> <text v-else-if="item.type === 2">订餐单</text> </view> <view class="index-list-item-head-r">{{item.distance}}km</view> </view> <view class="index-list-item-head-r">{{item.distance}}km</view> </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0"> {{item.categoryName}}｜{{item.priceNum1}}斤 </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1"> {{item.categoryName}}｜{{item.priceNum1}}人 </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2"> {{item.categoryName}}｜{{item.priceNum1}}人 </view> <view class="index-list-item-info" v-if="item.type === 1"> {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}天 </view> <view class="index-list-item-info" v-if="item.type === 2"> {{item.wayInfoCopy}} </view> <view class="address" v-if="item.type === 1"> <view class="address-xian"></view> <view class="address-row" v-if="item.wayInfo" v-for="(address, i) in item.wayInfo" :key="i"> <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image> <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image> <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image> <text>{{item.location}}</text> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0"> {{item.categoryName}}｜{{item.priceNum1}}斤 </view> </view> <template v-if="[0, 2].includes(item.type)"> <view class="index-list-item-dz"> <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image> <text>{{item.location}}</text> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1"> {{item.categoryName}}｜{{item.priceNum2}}人 </view> <view class="index-list-item-dz"> <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image> <text>{{item.startDate}} 至 {{item.endDate}}（{{item.totalDays}}天）</text> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0"> {{item.categoryName}}｜{{item.priceNum1}}天 ｜{{item.priceNum2}}人 </view> </template> <view class="index-list-item-price"> <text>预估：</text> <text>¥{{item.estimatedAccount / 100}}</text> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1"> {{item.categoryName}}｜{{item.priceNum1}}小时 ｜{{item.priceNum2}}人 </view> <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2"> {{item.categoryName}}｜{{item.priceNum1}}斤 </view> <view class="index-list-item-info" v-if="item.type === 1"> {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}｜用车{{item.priceNum1}}{{item.carType === 0?"天":"次"}} </view> <view class="index-list-item-info" v-if="item.type === 2"> {{item.wayInfoCopy}} </view> <view class="address" v-if="item.type === 1"> <view class="address-xian"></view> <view class="address-row" v-if="item.wayInfo" v-for="(address, i) in item.wayInfo" :key="i"> <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image> <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image> <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image> <text>{{item.location}}</text> </view> </view> <template v-if="[0, 2].includes(item.type)"> <view class="index-list-item-dz"> <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image> <text>{{item.location}}</text> </view> <view class="index-list-item-dz"> <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image> <text>{{item.startDate}} 至 {{item.endDate}}（{{item.totalDays}}天）</text> </view> </template> <view class="index-list-item-price"> <text>预估：</text> <text>¥{{item.estimatedAccount / 100}}</text> </view> </view> <view class="eidt"> <!-- <sunui-mverify @change="getaccept($event, item.id, index)"></sunui-mverify> --> @@ -82,7 +90,7 @@ </view> <!-- 发单方 --> <view class="index-c" v-if="!userInfo || userInfo.useIdentity === 0"> <view class="index-c" v-if="!isLogin || !userInfo || userInfo.useIdentity === 0"> <view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view> <view class="index-c-title" :style="{ height: navHeight + 'px' }" @click="selectAddress(-1)"> <text class="index-c-title-logo">近快</text> @@ -323,9 +331,12 @@ <view></view> <text>客服电话</text> </view> <view class="phone-item" v-if="serverPhone" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)"> <view></view> <text>{{item}}</text> <view class="phone-item" v-if="serverPhone" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)"> <view> <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image> <text>{{item}}</text> </view> <view class="line" v-if="index<serverPhone.length-1"></view> </view> <view style="width: 100%; height: 30rpx;"></view> <!-- <view class="phone-botton" @click="contactPhone()" >关闭</view> --> @@ -2033,12 +2044,27 @@ color: #222222; } } .phone > .phone-item:last-of-type { /* 样式 */ border-bottom:none !important; } .phone-item { width: 100%; text-align: center; justify-content: space-between; border-bottom: 1rpx solid #eeeeee; // border-bottom: 1rpx solid #eeeeee; line-height: 78rpx; image{ width: 28rpx; height: 28rpx; margin-right: 30rpx; } .line{ width: 100%; height: 1rpx; background-color: #f2f2f2 } text { font-weight: 500; font-size: 28rpx; small-program/pages/order-details/order-details.vue
@@ -55,7 +55,7 @@ <text v-if="info.type===2">订餐单</text> </view> <view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}｜{{info.priceNum1 || '' }}{{info.workType === 0?'斤':'人'}}</view> <view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}｜{{info.priceNum1 || '' }}{{feeFrom.priceParam1.unit}}{{info.type==0&info.workType==2&&info.carType==2?' | '+info.priceNum2+'人':''}}</view> <view v-if="info.type===1" class="order-info-wz">{{info.carUnit || ''}}{{' | '}}{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}需{{info.priceNum2 || '' }}辆</view> <view class="order-info-address"> <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image> @@ -111,16 +111,10 @@ </view> <view class="price-row"> <view class="price-row-label">预估总费用(元)</view> <view class="price-row-val" :style="{color: userInfo.id !== info.acceptMemberId ? '#FF0000' : ''}"> <view class="price-row-val" :style="{color: (!isPushlishor&&info.status!=4&&info.status!=5) || (isPushlishor&&info.type!=2 &&info.status!=4&&info.status!=5) ? '#FF0000' : ''}"> ¥{{((info.originEstimatedAccount||0)/100).toFixed(2) }} </view> </view> <view class="price-row" v-if="isAcceptor&&(info.type==2 || (info.status!=5&& info.status!=4))"> <view class="price-row-label">实际到账(元)</view> <view class="price-row-val" style="color: #FF0000;"> ¥{{((info.receiveAccount || 0) / 100).toFixed(2) }} </view> </view> </view> </view> <template v-if="info.type!=2&&(info.status==5|| info.status==4)"> <view class="order-info-x"></view> @@ -142,7 +136,7 @@ </view> <view class="price-row"> <view class="price-row-label">实际总费用(元)</view> <view class="price-row-val" style="color: #FF0000"> <view class="price-row-val" :style="{color: info.status !=4 ? '#FF0000' : ''}"> ¥{{((info.estimatedAccount||0)/100).toFixed(2) }} </view> </view> @@ -160,12 +154,12 @@ <view class="order-info-supplement-title">实际费用</view> </view> <view class="order-info-price"> <view class="price-row"> <view class="price-row-label" v-if="isPushlishor">实际支付</view> <view class="price-row" v-if="isPushlishor"> <view class="price-row-label" >实际支付(元)</view> <view class="price-row-val" style="color: #FF0000;">¥{{((info.payAccount||0)/100).toFixed(2) }} </view> </view> <view class="price-row" v-if="isAcceptor && info.status==4" > <view class="price-row-label">实际到账</view> <view class="price-row-label">实际到账(元)</view> <view class="price-row-val" style="color: #FF0000;">¥{{((info.receiveAccount||0)/100).toFixed(2) }} </view> </view> @@ -351,23 +345,23 @@ <viem class="money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem> </view> <view class="querenfee-c" > <view class="querenfee-c-info1"><text style="color: red;">*</text>实际{{feeFrom.priceParam1.name}}</view> <view class="querenfee-c-info1"><text style="color: red;">*</text>实际{{feeFrom.priceParam1.name}}:</view> <view class="querenfee-c-input"> <input type="number" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" v-model="feeFrom.priceNum1" placeholder="请输入" /> <input type="number" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" v-model="feeFrom.priceNum1" placeholder="0" /> </view> <text class="querenfee-c-danw">{{feeFrom.priceParam1.unit}}</text> </view> <view class="querenfee-c" v-if="feeFrom.priceParam2.name !=null"> <view class="querenfee-c-info1"><text style="color: red;">*</text>实际{{feeFrom.priceParam2.name}}：</view> <view class="querenfee-c-input"> <input type="number" v-model="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" placeholder="请输入" /> <input type="number" v-model="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" placeholder="0" /> </view> <text class="querenfee-c-info1" >{{feeFrom.priceParam2.unit}}</text> <text class="querenfee-c-danw" >{{feeFrom.priceParam2.unit}}</text> </view> <view class="querenfee-c"> <view class="querenfee-c-info1">其他费用：</view> <view class="querenfee-c-input"> <input type="digit" v-model="feeFrom.confirmOtherFee" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" placeholder="请输入" /> <input type="digit" v-model="feeFrom.confirmOtherFee" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" placeholder="0" /> </view> <text class="querenfee-c-danw">元</text> </view> @@ -532,8 +526,11 @@ price: this.info.price, priceUnit: this.feeFrom.priceParam1.unit, priceNum1: this.feeFrom.priceNum1 || 0, priceNum2: this.feeFrom.priceNum2 || 0, type: this.info.type priceNum2: this.feeFrom.priceNum2 || 0, confirmOtherFee:(this.feeFrom.confirmOtherFee||0)*100, type: this.info.type, carType:this.info.carType , workType: this.info.workType }).then(res => { if (res.code === 200) { this.confirmPayFee = (res.data / 100) || '0' @@ -541,6 +538,7 @@ }) }, confirmFee(){ var that =this if (!this.feeFrom.priceNum1) { return uni.showToast({ title: '实际' + this.feeFrom.priceParam1.name + '不能为空', @@ -670,7 +668,7 @@ } }) }, acceptDo(){ acceptDoBiz(){ var that = this var param = {orderId: this.id} this.$u.api.accept(param).then(res =>{ @@ -680,6 +678,18 @@ that.getOrderData() } }) }, acceptDo() { var that = this; uni.requestSubscribeMessage({ tmplIds: ['AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8','3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk','tDpYImlrdv-0d3euTrHbYZ1cEZvjVHTNlqHvV0tpLHg'], success(res) { that.acceptDoBiz() }, fail(err) { that.acceptDoBiz() } }) }, cancelDo(){ var that = this @@ -820,15 +830,8 @@ //如果是接单方 that.isAcceptor =true } if(that.isAcceptor ||that.isPushlishor ){ // if(that.isAcceptor ||that.isPushlishor ){ that.info = res.data if(that.userInfo.id === that.info.releaseMemberId ){ //如果是发单方 that.isPushlishor =true }else if(that.userInfo.id === that.info.acceptMemberId ){ //如果是接单方 that.isAcceptor =true } that.amount = ((that.info.estimatedAccount || 0) / 100).toFixed(2) if(that.info.wayInfo){ that.wayList = JSON.parse(that.info.wayInfo) @@ -840,9 +843,9 @@ that.updateTimeInfo1() } that.initPriceNumParam() }else{ uni.showToast({ title: '订单信息不存在', icon: 'error', duration: 2000 }); } // }else{ // uni.showToast({ title: '订单信息不存在', icon: 'error', duration: 2000 }); // } } }) }, @@ -853,13 +856,13 @@ this.feeFrom.priceParam2.unit =null if(this.info.type==0 && this.info.workType==1){ //分拣工 this.feeFrom.priceParam1.name ='用工天数：' this.feeFrom.priceParam1.name ='用工天数' this.feeFrom.priceParam1.unit ='天' this.feeFrom.priceParam2.name ='用工人数：' this.feeFrom.priceParam2.name ='用工人数' this.feeFrom.priceParam2.unit ='人' }else if(this.info.type==0 && this.info.workType==0){ //采摘工 this.feeFrom.priceParam1.name ='采摘重量：' this.feeFrom.priceParam1.name ='采摘重量' this.feeFrom.priceParam1.unit ='斤' this.feeFrom.priceParam2.name =null this.feeFrom.priceParam2.unit =null @@ -874,10 +877,10 @@ }else if(this.info.carType==1){ //按小时 this.feeFrom.priceParam1.name ='工作时长' this.feeFrom.priceParam1.unit ='时' this.feeFrom.priceParam1.unit ='小时' this.feeFrom.priceParam2.name ='用工人数' this.feeFrom.priceParam2.unit ='人' }else if(this.info.carType==1){ }else if(this.info.carType==2){ //按小时 this.feeFrom.priceParam1.name ='包装重量' this.feeFrom.priceParam1.unit ='斤' small-program/pages/packaging-worker/packaging-worker.vue
@@ -44,13 +44,6 @@ <u-icon name="arrow-right" color="#111111" size="16"></u-icon> </view> </view> <view class="list-item-row"> <view class="list-item-row-label">用工数量<b>*</b></view> <view class="list-item-row-val"> <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="请输入" /> <text>人</text> </view> </view> <view class="list-item-row" v-if="viewStatus"> <view class="list-item-row-label">需求补充</view> <view class="list-item-row-val"> @@ -92,6 +85,13 @@ <text v-if="form.carType === 0">天</text> <text v-if="form.carType === 1">小时</text> <text v-if="form.carType === 2">斤</text> </view> </view> <view class="list-item-row"> <view class="list-item-row-label">用工数量<b>*</b></view> <view class="list-item-row-val"> <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="请输入" /> <text>人</text> </view> </view> <view class="list-item-row"> @@ -294,8 +294,9 @@ this.$u.api.getTotal({ price: Number(this.form.price) * 100, priceNum1: this.form.priceNum1, priceNum2: this.form.priceNum2, priceNum2: this.form.priceNum2, type: this.form.type, carType:this.form.carType , workType: this.form.workType }).then(res => { if (res.code === 200) { small-program/pages/sorting/sorting.vue
@@ -272,7 +272,7 @@ priceUnit: this.form.priceUnit, priceNum1: this.form.priceNum1, priceNum2: this.form.priceNum2, type: this.form.type, type: this.form.type, workType: this.form.workType }).then(res => { if (res.code === 200) { small-program/static/icon/ic_money.pngBinary files differ
small-program/static/icon/ic_money@3x.pngBinary files differ
small-program/static/icon/ic_renzhengzhong.pngBinary files differ
small-program/static/icon/ic_renzhengzhong@3x.pngBinary files differ
small-program/static/image/ic_sanlunche@2x.pngBinary files differ
small-program/static/image/ic_xiaohuoche@2x.pngBinary files differ
