qiubinghui
/
zhywpt-sp
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

替换ui

master
yangteng 6 月之前
父節點
393d0e6fd6
當前提交
be66904331
共有 34 個文件被更改，包括 446 次插入 和 387 次删除
分割檢視 顯示文件統計
  1. 1
    2
      components/nav-bar/nav-bar2.vue
  2. 97
    0
      components/tips/tips.vue
  3. 1
    1
      composables/order/useOrderSkip.ts
  4. 30
    10
      pages.json
  5. 6
    2
      pages/bluetooth/bluetooth.vue
  6. 28
    20
      pages/index/index.vue
  7. 2
    5
      pages/order/components/order-list-item-new.vue
  8. 2
    3
      pages/service/service.vue
  9. 2
    2
      pages/user/user.vue
  10. 2
    2
      subpackage/after-sale/add-equity/equity-product-evaluation.vue
  11. 25
    15
      subpackage/after-sale/deviceInfo/deviceInfo.vue
  12. 4
    3
      subpackage/orders/car-release.vue
  13. 6
    15
      subpackage/orders/choice-product.vue
  14. 5
    4
      subpackage/orders/equity/equityList.vue
  15. 3
    3
      subpackage/orders/equity/interestsList.vue
  16. 13
    43
      subpackage/orders/essential-information-two.vue
  17. 13
    19
      subpackage/orders/essential-information.vue
  18. 4
    6
      subpackage/orders/opening-account-people.vue
  19. 4
    4
      subpackage/orders/opening-account-unit.vue
  20. 2
    2
      subpackage/orders/order-detail-logistics.vue
  21. 2
    2
      subpackage/orders/order-details-new.vue
  22. 10
    36
      subpackage/orders/order-evaluate-product.vue
  23. 7
    23
      subpackage/orders/order-evaluate-salesman.vue
  24. 5
    5
      subpackage/orders/order-evaluate.vue
  25. 7
    7
      subpackage/orders/order_payment.vue
  26. 4
    6
      subpackage/orders/product-detail.vue
  27. 10
    10
      subpackage/orders/release-products.vue
  28. 114
    114
      subpackage/personal-center/install-activation-order.vue
  29. 3
    4
      subpackage/personal-center/remind/evaluate-list.vue
  30. 3
    4
      subpackage/service/remind/evaluate-list.vue
  31. 6
    9
      utils/network/api.js
  32. 1
    1
      utils/network/difference.js
  33. 6
    1
      utils/network/request.js
  34. 18
    4
      utils/utils.ts

+ 1
- 2
components/nav-bar/nav-bar2.vue 查看文件

@@ -2,8 +2,7 @@
<view class="nav-bar" :class="scrollTop>navHeight?navbgClass:''" :style="{height:navHeight+'px',color:fontColor}">
<view class="title"
:style="{paddingTop:searchMarginTop+'px',height:searchHeight+'px',lineHeight:searchHeight+'px'}">
<!-- <block v-if="isBack && !isAlipay"> -->
<block v-if="isBack">
<block v-if="isBack && !isAlipay">
<image :src="navbgClass=='nav-bg'?`/static/image/icon-back.png`:'/static/image/icon-back-white.png'" :style="{height:searchHeight+'px',width:searchHeight+'px'}"
class="back" @click="back(title,type,userType,orderId)"></image>
</block>

+ 97
- 0
components/tips/tips.vue 查看文件

@@ -0,0 +1,97 @@
<template>
<view class="bg-tips" v-if="props.showTips">
<view class="tips">
<view class="top-content">
<image class="tips-image" :src="`${$imgUrl}common/tips.png`" mode=""></image>
<text class="tishi">提示</text>
</view>
<view class="title">服务开通中敬请期待</view>
<view>
<text class="cancle" @click="emits('cancle', false)">取消</text>
<text class="sure" @click="emits('cancle', false)">确定</text>
</view>
</view>
</view>
</template>

<script setup lang="ts">
const emits = defineEmits(["cancle"]);
const props = defineProps({
showTips: {
type: Boolean,
default: false
}
})
</script>

<style scoped lang="scss">
.bg-tips{
width: 100%;
height: 100vh;
background: rgba(0,0,0,0.5);
position: fixed;
left: 0;
top:0;
z-index: 99999;
.tips{
width: 60%;
height: 360rpx;
background: #FFFFFF;
border-radius: 12rpx;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
padding: 70rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
.top-content{
display: flex;
align-items: center;
}
.tips-image{
width: 40rpx;
height: 40rpx;
}
.tishi{
font-weight: 500;
font-size: 36rpx;
color: #01243A;
margin-left: 10rpx;
}
.title{
font-weight: 400;
font-size: 30rpx;
color: #222222;
}
.cancle{
width: 200rpx;
height: 80rpx;
background: #FFFFFF;
border-radius: 12rpx 12rpx 12rpx 12rpx;
color: black;
display: inline-block;
border: 1rpx solid #004576;
border-radius: 40rpx;
text-align: center;
line-height: 80rpx;
font-size: 30rpx;
margin-right: 20rpx;
}
.sure{
width: 200rpx;
height: 80rpx;
background: linear-gradient( to right, #01243A, #004576);
border-radius: 40rpx;
display: inline-block;
color: white;
text-align: center;
line-height: 80rpx;
font-size: 30rpx;
}
}
}
</style>

+ 1
- 1
composables/order/useOrderSkip.ts 查看文件

@@ -199,7 +199,7 @@ export default function useOrderSkip() {

//查看物流
const gotoCheckLogistics = (orderInfo : any) => {
navTo(`/subpackage/orders/order-detail-logistics?orderInfo=${JSON.stringify(orderInfo)}`);
navTo(`/subpackage/orders/order-detail-logistics?orderInfo=${encodeURIComponent(JSON.stringify(orderInfo))}`);
}



+ 30
- 10
pages.json 查看文件

@@ -962,7 +962,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -975,7 +977,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1017,7 +1021,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1030,7 +1036,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1062,7 +1070,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1075,7 +1085,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES", // 允许点击穿透后，才能触发导航栏上的 onTap 事件
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1088,7 +1100,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1119,7 +1133,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1132,7 +1148,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},
@@ -1145,7 +1163,9 @@
"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
"transparentTitle": "always",
"titlePenetrate": "YES",
"defaultTitle": "" // 将导航栏默认的 title 置空
"defaultTitle": "" ,// 将导航栏默认的 title 置空
"navigationBarFrontColor":"white",
"navigationBarBackgroundColor":"white"
}
}
},

+ 6
- 2
pages/bluetooth/bluetooth.vue 查看文件

@@ -94,7 +94,8 @@
refundBalance: "",
vehPosImgUrl: "",
vehNegImgUrl: "",
isAfter: ''
isAfter: '',
backIndex:"",//1返回首页 ""返回订单列表
});
const deviceList = ref([]);
const connectPrefixName = ref(null);
@@ -160,6 +161,9 @@
if (option.isAfter) {
state.isAfter = option.isAfter;
}
if (option.backIndex) {
state.backIndex = option.backIndex;
}

console.log("传过来的参数", option)
});
@@ -649,7 +653,7 @@
});
} else if (routeType.value == "4") {
uni.navigateTo({
url: "/subpackage/after-sale/deviceInfo/deviceInfo",
url: `/subpackage/after-sale/deviceInfo/deviceInfo?backIndex=${state.backIndex}`,
});
} else if (routeType.value == "5") {
// #ifdef MP-ALIPAY

+ 28
- 20
pages/index/index.vue 查看文件

@@ -19,7 +19,6 @@
<view class="search-box">
<image :src="`${fileURL}image/newHome/search.png`" class="icon" mode="aspectFill"></image>
<input class="search" placeholder="办业务·搜一搜" @input="onKeyInput" />
<!-- <u-input v-model="searchParams" type="text" :border="false" :height="80" placeholder-style='color: #fff;' /> -->
</view>
</view>

@@ -45,32 +44,22 @@
</view>

<view class="supervision-con">
<!-- <u-swiper :list="state.swiperListArr"></u-swiper> -->
<swiper class="swiper" circular :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay"
:interval="swiper.interval" :duration="swiper.duration" >
<block v-if="state.swiperList.length >0" v-for="item in state.swiperList" :key="item.id">
<swiper-item class="swiper-item" @click="link(item)">
<swiper-item class="swiper-item" @click="call()">
<image :src="fileURLList + item.imgUrl" mode="widthFix" class='img'></image>
</swiper-item>
</block>
</swiper>
<!-- <view class="txt">
ETC服务监督电话
</view>
<view class="phone">
0851-883065555
</view>
<view class="btn">
<text>立即拨打 ＞</text>
</view> -->
</view>

<view class="title-name title-h">
快速办理
</view>
<view class="express-lane">
<view class="item keche" :style="{'--bgimg':`url(${fileURL}image/newHome/keche.png)`}">
<view class="item-con" @click="showMask(1)">
<view class="item keche" @click="showMask(1)" :style="{'--bgimg':`url(${fileURL}image/newHome/keche.png)`}">
<view class="item-con" >
<view class="top-txt">
客车用户
</view>
@@ -79,8 +68,8 @@
</view>
</view>
</view>
<view class="item huoche" :style="{'--bgimg':`url(${fileURL}image/newHome/huoche.png)`}">
<view class="item-con" @click="showMask(2)">
<view class="item huoche" @click="showMask(2)" :style="{'--bgimg':`url(${fileURL}image/newHome/huoche.png)`}">
<view class="item-con" >
<view class="top-txt">
货车用户
</view>
@@ -198,6 +187,8 @@
</filter>
</view>
</view>
<!-- 提示 -->
<tips :showTips="state.showTips" @cancle="cancle"></tips>
</template>
<script setup lang="ts">
import {
@@ -210,6 +201,7 @@
} from "@dcloudio/uni-app";
import flowPathList from "./components/flow-path-list.vue";
import filter from '@/components/filter/filter.vue';
import tips from '@/components/tips/tips.vue';
import { requestNew} from "@/utils/network/request.js";
import {
setItem,
@@ -246,14 +238,19 @@
console.log("wechatSignNo", options)
getInfo();
})
const cancle=(val)=>{
state.showTips=val
}
onMounted(() => {
const query = uni.createSelectorQuery().in(instance.proxy);
query
.select(".news-con")
.boundingClientRect((data) => {
console.log("得到布局位置信息", data);
console.log("节点离页面顶部的距离为" + data.top);
newTop.value = data.top
if(data){
console.log("节点离页面顶部的距离为" + data.top);
newTop.value = data.top
}
})
.exec();
let systemInfo = uni.getSystemInfoSync()
@@ -281,7 +278,7 @@
const navList = [{
imgUrl: `${fileURL}image/newHome/kaqian.png`,
title: "卡签信息查询",
path: '/pages/bluetooth/bluetooth?routeType=4'
path: '/pages/bluetooth/bluetooth?routeType=4&&backIndex=1'
}, {
imgUrl: `${fileURL}image/newHome/jihuo.png`,
title: "激活服务",
@@ -336,6 +333,10 @@
jumpOldMini()
return;
}
if(item.title=='网点查询' || item.title=='业务指引'){
state.showTips=true
return;
}
if (item.path) {
navTo(item.path, true)
} else if (item.handlePath) {
@@ -402,7 +403,8 @@
processeConditionText: "", //办理条件文本
commonQuestionText: "", //常见问题文本
commonQuestionArr: [], //常见问题数组
isEnableSetGray: false
isEnableSetGray: false,
showTips:false
});
// 页面初次渲染完成时触发
onReady(() => {
@@ -625,6 +627,11 @@
});
}
}
const call=()=>{
uni.makePhoneCall({
phoneNumber: '0851-88306555' //仅为示例，并非真实的电话号码
})
}
</script>
<style lang="scss" scoped>
.container {
@@ -1089,6 +1096,7 @@
top: 0;
right: 0;
bottom: 0;
z-index: 999;
}

.mask-content {

+ 2
- 5
pages/order/components/order-list-item-new.vue 查看文件

@@ -9,9 +9,6 @@
</view>
<view v-if="item.promotionModes==1" class="xiao">小程序</view>
<view v-else class="xianxia">线下网点</view>
</view>
<view>

</view>
<view class="content">
<view class="picture">
@@ -94,7 +91,7 @@

<!-- 待收货 -->
<view class="btns" v-else-if="item.orderStep == OrderStatus.待收货">
<view class="btn btn-normal" @click.stop="gotoCheckLogistics(item)">查看物流</view>
<view class="btn btn-normal" @click.stop="gotoOrderDetails(item)">查看物流</view>
<!-- 待收货异地 发货之后确认收货之前可以补货 -->
<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.deviceType == deviceType">
申请补货</view>
@@ -132,7 +129,7 @@
<!-- 已完成 售后订单不允许评价产品，储值卡转记账卡除外-->
<!-- 发行产品 isProduct=0; 业务员 isStaff=0; 权益 isEquity=0 业务服务 isService=0; -->
<view class="btns"
v-else-if="item.orderStep == OrderStatus.已完成 && (item.orderType =='ISSUE' || item.orderType =='VALUE_TO_ACCOUNT') ">
v-else-if="item.orderStep == OrderStatus.已完成">

<view class="btn btn-normal" v-if="( item.isProduct==1 && item.isService==1) ">
已评价

+ 2
- 3
pages/service/service.vue 查看文件

@@ -27,7 +27,7 @@
reactive,
} from "vue";
import {
onShow
onLoad
} from "@dcloudio/uni-app";
import {
fileURL, fileURLList
@@ -60,7 +60,7 @@
searchVal: '', //input输入值
newArr: []
});
onShow(() => {
onLoad(() => {
console.log("1")
if (!hasLogin()) {
console.log("2")
@@ -70,7 +70,6 @@
});
}, '温馨提示', true, '去登录');
} else {
tableSelectIndex.value=0
console.log("请求")
console.log(tableSelectIndex.value,'111')
queryMenuConfigAction().then((val : any) => {

+ 2
- 2
pages/user/user.vue 查看文件

@@ -28,14 +28,14 @@
<image :src="`${$imgUrl}myImage/shezhi.png`" class="img" mode="widthFix"></image>
</view>
</view>
<view class="my-equity" :style="{'--bgimg':`url(${$imgUrl}myImage/quanuyikuang.png)`}">
<view class="my-equity" :style="{'--bgimg':`url(${$imgUrl}myImage/quanuyikuang.png)`}" @click="goEquity()">
<view class="l-con">
<image :src="`${$imgUrl}myImage/quanyi.png`" class="equity-icon" mode="widthFix"></image>
<view class="txt">
我的权益
</view>
</view>
<view class="r-icon" @click="goEquity()">
<view class="r-icon" >
<image :src="`${$imgUrl}myImage/quanyixiayi.png`" class="r-img" mode="widthFix"></image>
</view>
</view>

+ 2
- 2
subpackage/after-sale/add-equity/equity-product-evaluation.vue 查看文件

@@ -48,7 +48,7 @@
import { reactive, onMounted, ref } from "vue";
import { confirm, isBlank, msg } from "@/utils/utils";
import tagPopup from "@/subpackage/orders/components/popup-order-evaluate-tag";
import { request } from "@/utils/network/request";
import { request, requestNew } from "@/utils/network/request";
import { orderDetail, addEvaluation, addProductInterestApi } from "@/utils/network/api";
import { onLoad } from "@dcloudio/uni-app";
import { stringToJson } from "@/utils/network/encryption";
@@ -180,7 +180,7 @@
showLoading: true,
}
console.log("options", options)
request(addEvaluation, options).then((res) => {
requestNew(addEvaluation, options).then((res) => {
addProductInterestRequest()
})
}

+ 25
- 15
subpackage/after-sale/deviceInfo/deviceInfo.vue 查看文件

@@ -18,10 +18,6 @@
<view class="cell-left">车辆类型</view>
<view class="cell-right">{{ card.type }}</view>
</view>
<!-- <view class="cell">
<view class="cell-left">车辆用户类型</view>
<view class="cell-right">{{ card.v_userType }}</view>
</view> -->
<view class="cell">
<view class="cell-left">车牌号</view>
<view class="cell-right">{{ card.vehiclePlate }}</view>
@@ -130,7 +126,7 @@
<view class="cell-right">{{getCodeName('OBU_STATE_TYPE',state.obuStatus)}}</view>
</view>
</view>
<view class="btn" @click="back">返回订单列表</view>
<view class="btn" @click="back">返回</view>
</view>
</template>

@@ -205,9 +201,11 @@
vehicleId: "",
obuStatus: "",
cardStatus: "",
cardTypeName: ""
cardTypeName: "",
backIndex:""
})
onLoad((option) => {
state.backIndex=option.backIndex
getCardId()
})

@@ -415,9 +413,16 @@
//返回按钮
const back = () => {
uni.$emit("refreshOrder");
uni.switchTab({
url: "/pages/index/index"
})
if(state.backIndex=="1"){
uni.switchTab({
url: "/pages/index/index"
})
}else{
uni.redirectTo({
url: "/pages/order/order"
})
}
}

//提示对话框
@@ -460,44 +465,49 @@
<style scoped>
.wrapper {
padding-bottom: 50rpx;
background: #E9EDF0;
overflow: hidden;
}

.info-card {
margin: 30rpx;
border-radius: 16rpx;
padding-bottom: 40rpx;
box-shadow: 0rpx 6rpx 25rpx 0rpx rgba(0, 0, 0, 0.3);
background-color: white;
padding: 0 30rpx;
box-sizing: border-box;
}

.info-card .title {
padding: 30rpx 0;
font-size: 36rpx;
text-align: center;
color: #13E7C1;
color: #01243A;
}

.info-card .cell {
display: flex;
flex-direction: row;
padding: 15rpx 40rpx;
padding: 18rpx 0rpx;
font-size: 30rpx;
border-bottom: 1rpx solid #E6E9EB;
}

.cell-left {
flex: 1;
text-align: left;
color: #666;
color: #6C6C6C;
}

.cell-right {
margin-left: 30rpx;
text-align: right;
color: #333;
color: #111111;
overflow: hidden;
}

.btn {
background: linear-gradient(to right, #13E7C1, #43A1E0);
background: linear-gradient(to right,#01243A,#004576);
opacity: 1;
border-radius: 100rpx;
color: #fff;

+ 4
- 3
subpackage/orders/car-release.vue 查看文件

@@ -258,6 +258,7 @@
import { onLoad, onPageScroll } from "@dcloudio/uni-app";
import { getItem, StorageKeys } from "@/utils/storage";
import { msg, strReplace, hasLogin, uploadFile, compressImage, chooseImageCompress } from "@/utils/utils";
import {navTo } from "@/utils/utils";
import {
getCodeName
} from "@/datas/queryKey.js";
@@ -383,9 +384,9 @@
};
requestNew(vehicleUpload, options)
.then((res) => {
uni.navigateTo({
url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
});
navTo(
`/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
);
})
.catch((res) => {
console.log(res);

+ 6
- 15
subpackage/orders/choice-product.vue 查看文件

@@ -60,7 +60,7 @@
import navBar from "@/components/nav-bar/nav-bar2.vue";
import { setItem } from "@/utils/storage.ts";
import { agentId } from "@/utils/network/difference";
import { msg } from "@/utils/utils";
import { msg,navTo } from "@/utils/utils";
const imgURL = `${fileURL}image/`;

let bgc = ""
@@ -88,15 +88,9 @@
state.cardType = 3
}
setItem("isValueCard", state.isValueCard);
uni.navigateTo({
url: `/subpackage/orders/interestsList?userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&cardType=${state.cardType}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}&signAgencyId=${state.signAgencyId}`,
});
navTo(`/subpackage/orders/interestsList?userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&cardType=${state.cardType}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}&signAgencyId=${state.signAgencyId}`)
}
// setTimeout(() => {
// uni.navigateTo({
// url: `/subpackage/orders/equity/equityList?userType=${state.userType}&vanType=${state.vanType}&cardType=${1}&isValueCard=${2}`,
// });
// }, 1000)
const toEquity = (itemData) => {
if (itemData['cardTypeArr'].split(",").length == 1) {
if (itemData['cardTypeArr'].split(",")[0] == "记账卡") {
@@ -114,9 +108,8 @@
console.log("state.isValueCard", state.isValueCard)
setItem("isValueCard", state.isValueCard);
setItem("currentProductList", itemData);
uni.navigateTo({
url: `/subpackage/orders/equity/equityList?userType=${state.userType}&vanType=${state.vanType}&cardType=${state.cardType}&isValueCard=${state.isValueCard}`,
});
navTo(`/subpackage/orders/equity/equityList?userType=${state.userType}&vanType=${state.vanType}&cardType=${state.cardType}&isValueCard=${state.isValueCard}`)
}
const savaHandle = (val, idx) => {
console.log("vAL", val)
@@ -148,9 +141,7 @@
}
console.log("state.isValueCard", state.isValueCard)
setItem("isValueCard", state.isValueCard);
uni.navigateTo({
url: `/subpackage/orders/interestsList?equityId=${val.equityList[idx].equityId}&userType=${state.userType}&vanType=${state.vanType}&cardType=${state.cardType}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['deviceType']}&productId=${val['productId']}`,
});
navTo(`/subpackage/orders/interestsList?equityId=${val.equityList[idx].equityId}&userType=${state.userType}&vanType=${state.vanType}&cardType=${state.cardType}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['deviceType']}&productId=${val['productId']}`)
} else {
state.radiolist1 = [];
// 处理卡的数据

+ 5
- 4
subpackage/orders/equity/equityList.vue 查看文件

@@ -51,6 +51,7 @@
getItem,
setItem
} from "@/utils/storage.ts";
import {navTo } from "@/utils/utils";
const sendParams = ref({})
onLoad((e) => {
if (e) {
@@ -71,10 +72,10 @@
// setItem("promoteId", val.promoteId);
// 产品金额+权益金额
let fee = Number(currentProductList.value.fee) + Number(val.discountPrice);
uni.navigateTo({
url: `/subpackage/orders/equity/interestsList?equityId=${val.equityId}&userType=${sendParams.value.userType}&vanType=${sendParams.value.vanType}&cardType=${sendParams.value.cardType}&isValueCard=${sendParams.value.isValueCard}&fee=${fee}&signAgencyId=${currentProductList.value['deviceType']}&productId=${currentProductList.value['productId']}`,
});
navTo(`/subpackage/orders/equity/interestsList?equityId=${val.equityId}&userType=${sendParams.value.userType}&vanType=${sendParams.value.vanType}&cardType=${sendParams.value.cardType}&isValueCard=${sendParams.value.isValueCard}&fee=${fee}&signAgencyId=${currentProductList.value['deviceType']}&productId=${currentProductList.value['productId']}`)
// uni.navigateTo({
// url: `/subpackage/orders/equity/interestsList?equityId=${val.equityId}&userType=${sendParams.value.userType}&vanType=${sendParams.value.vanType}&cardType=${sendParams.value.cardType}&isValueCard=${sendParams.value.isValueCard}&fee=${fee}&signAgencyId=${currentProductList.value['deviceType']}&productId=${currentProductList.value['productId']}`,
// });
};
</script>


+ 3
- 3
subpackage/orders/equity/interestsList.vue 查看文件

@@ -86,9 +86,9 @@
)
} else {
// 正常流程
uni.navigateTo({
url: `/subpackage/orders/essential-information?userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&cardType=${state.cardType}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&productId=${state.productId}`,
});
navTo(
`/subpackage/orders/essential-information?userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&cardType=${state.cardType}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&productId=${state.productId}`,
);
}
}


+ 13
- 43
subpackage/orders/essential-information-two.vue 查看文件

@@ -100,7 +100,7 @@
} from "@/utils/network/api.js";
import { request, requestNew } from "@/utils/network/request.js";
import { reactive, ref } from "vue";
import { msg, noticeUser } from "@/utils/utils";
import { msg, noticeUse,navTo } from "@/utils/utils";
const scrollTop = ref(0);
const state = reactive({
data: {
@@ -133,15 +133,15 @@
equityId: ""
});
const goToAddAddress = () => {
uni.navigateTo({
url: "/subpackage/orders/addAddress",
});
navTo(
"/subpackage/orders/addAddress",
);
};
const editAddress = (val) => {
console.log("val", val)
uni.navigateTo({
url: `/subpackage/orders/editAddress?content=` + JSON.stringify(val),
});
navTo(
`/subpackage/orders/editAddress?content=` + JSON.stringify(val),
);
};

const addressSelected = (val : any) => {
@@ -176,23 +176,17 @@
const data = res;
state.orderId = data.orderId
console.log(data);
//提交产品信息 接口直接不要了
// productReCodeAction(data.orderId).then((result) => {
// 加购权益产品
// addProductRequest().then((res) => { //接口直接不要了
var vehicleId = state.data.vehiclePlate + "_" + state.data.vehiclePlateColor
console.log("state.data.vehiclePlate", state.data.vehiclePlate, state.data.vehiclePlateColor, vehicleId)
if (state.data.userType == 1) {
uni.navigateTo({
url: `/subpackage/orders/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
});
navTo(
`/subpackage/orders/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
);
} else {
uni.navigateTo({
url: `/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
});
navTo(
`/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
);
}
// })
// })
}
});
}
@@ -357,30 +351,6 @@
reject(error);
});
};
// const addProductRequest = () => {
// const options = {
// type: 2,
// data: {
// orderId: state.orderId, //订单编号
// openId: getItem(StorageKeys.OpenId), //操作人 id
// equityId: state.equityId, //权益Id
// totalAmount: state.totalAmount, //总金额
// isRepeatPurchase: 0
// },
// method: "POST",
// showLoading: true,
// };
// console.log("optionss", options);
// return new Promise(async (resolve, reject) => {
// const res = await request(addProduct, options);
// const data = stringToJson(res.bizContent);
// console.log("111")
// resolve(data);
// }).catch((error) => {
// console.log("222")
// reject(error);
// });
// }
</script>

<style lang="scss" scoped>

+ 13
- 19
subpackage/orders/essential-information.vue 查看文件

@@ -110,7 +110,7 @@
} from "@/utils/network/api.js";
import { request, requestNew } from "@/utils/network/request.js";
import { reactive, ref } from "vue";
import { msg, noticeUser } from "@/utils/utils";
import { msg, noticeUser,navTo } from "@/utils/utils";

const scrollTop = ref(0);
const state = reactive({
@@ -149,15 +149,15 @@
};

const goToAddAddress = () => {
uni.navigateTo({
url: "/subpackage/orders/addAddress",
});
navTo(
"/subpackage/orders/addAddress",
);
};
const editAddress = (val) => {
console.log("val", val)
uni.navigateTo({
url: `/subpackage/orders/editAddress?content=` + JSON.stringify(val),
});
navTo(
`/subpackage/orders/editAddress?content=` + JSON.stringify(val),
);
};
const carNumber = (val : any) => {
state.data.vehiclePlate = val;
@@ -334,24 +334,18 @@
const data = res;
state.orderId = data.orderId
console.log(data);
//提交产品信息 接口直接不要了
// productReCodeAction(data.orderId).then((result) => {
// 加购权益产品
// addProductRequest().then((res) => { //接口直接不要了
addKey = true
var vehicleId = state.data.vehiclePlate + "_" + state.data.vehiclePlateColor
console.log("state.data.vehiclePlate", state.data.vehiclePlate, state.data.vehiclePlateColor, vehicleId)
if (state.data.userType == 1) {
uni.navigateTo({
url: `/subpackage/orders/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
});
navTo(
`/subpackage/orders/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
);
} else {
uni.navigateTo({
url: `/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
});
navTo(
`/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&vanType=${state.data.vanType}&vehicleId=${vehicleId}`,
);
}
// })
// })
}
});
}

+ 4
- 6
subpackage/orders/opening-account-people.vue 查看文件

@@ -282,9 +282,7 @@
request, requestNew
} from "@/utils/network/request.js";

import {
stringToJson
} from "@/utils/network/encryption";
import {navTo } from "@/utils/utils";
import {
setItem,
getItem,
@@ -423,9 +421,9 @@
};
requestNew(userUpload, options).then((res) => {
console.log(res);
uni.navigateTo({
url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&vanType=${state.vanType}&isSign=${state.isSign}&vehicleId=${state.vehicleId}`,
});
navTo(
`/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&vanType=${state.vanType}&isSign=${state.isSign}&vehicleId=${state.vehicleId}`,
);
});
})


+ 4
- 4
subpackage/orders/opening-account-unit.vue 查看文件

@@ -143,7 +143,7 @@
ocrAllQuery,
idCardOcr, registerFull, userUpload
} from "@/utils/network/api.js";
import {navTo } from "@/utils/utils";
import {

requestNew
@@ -295,9 +295,9 @@
};
requestNew(userUpload, options).then((res) => {
const data = res;
uni.navigateTo({
url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&vanType=${state.vanType}&vehicleId=${state.vehicleId}`,
});
navTo(
`/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&vanType=${state.vanType}&vehicleId=${state.vehicleId}`,
);
});
})
};

+ 2
- 2
subpackage/orders/order-detail-logistics.vue 查看文件

@@ -150,10 +150,10 @@ import {getCodeName} from "@/datas/queryKey.js";

}
onLoad((options) => {
state.orderInfo = JSON.parse(options.orderInfo);
console.log("state.orderInfo", options)
state.orderInfo = JSON.parse(decodeURIComponent(options.orderInfo));
console.log("state.orderInfo", state.orderInfo)
state.orderShowInfo[0].value = state.orderInfo['orderId']?state.orderInfo['orderId']:state.orderInfo['orderNo']
// state.orderShowInfo[1].value = getOrderTypeName(state.orderInfo['orderType'])
state.orderShowInfo[1].value = '新办'
state.orderShowInfo[2].value = state.orderInfo['vehiclePlate']
state.orderShowInfo[3].value = state.orderInfo['userType'] === 'UNIT_USER' ? '单位' : '个人'

+ 2
- 2
subpackage/orders/order-details-new.vue 查看文件

@@ -139,7 +139,7 @@
</view>
<!-- 待收货 -->
<view v-if="state.orderInfo.orderStep == OrderStatus.待收货" class="btn-status">
<view class="btn space" @click="gotoCheckLogistics(state.orderInfo)">查看物流</view>
<view class="btn space" @click="gotoOrderDetails(state.orderInfo)">查看物流</view>
<view class="btn space" @click.stop="gotoReplenishmentOrder(state.orderInfo)" v-if="state.orderInfo.deviceType == deviceType">申请补货</view>
<view class="btn space" @click="gotoReturnOrder(state.orderInfo)" v-else>申请退货</view>
<view class="btn-green space" @click="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
@@ -255,7 +255,7 @@ const scrollTop = ref(0); //滚动距离
//按钮跳转业务逻辑
const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateProduct,
gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder,placeAnOrder,gotoReplenishmentOrder } = useOrderSkip();
gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder,placeAnOrder,gotoReplenishmentOrder,gotoOrderDetails } = useOrderSkip();


//获取订单详情

+ 10
- 36
subpackage/orders/order-evaluate-product.vue 查看文件

@@ -58,10 +58,9 @@
import { reactive } from "vue";
import { confirm, msg } from "@/utils/utils";
import tagPopup from "./components/popup-order-evaluate-tag";
import { request } from "@/utils/network/request";
import { orderDetail,orderEvaluateTag, addEvaluation} from "@/utils/network/api";
import { requestNew } from "@/utils/network/request";
import { orderDetailQuery,orderEvaluateTag, addEvaluation} from "@/utils/network/api";
import { onLoad } from "@dcloudio/uni-app";
import { stringToJson } from "@/utils/network/encryption";

const state = reactive({
orderInfo: {} as any, //订单信息
@@ -114,32 +113,15 @@
method: 'POST',
showLoading: true,
}
request(orderEvaluateTag, options).then((res) => {
console.log("获取评价标签", stringToJson(res.bizContent))
state.tagAllList = stringToJson(res.bizContent);
requestNew(orderEvaluateTag, options).then((res) => {
console.log("获取评价标签", res)
state.tagAllList = res
})
}
//删除图片
const removeImg = (imgList) => {
state.product.imageList = imgList
}
//选择图片权益产品
const backImgInterest = (e : any) => {
state.interest.imageList = e;
}

//删除图片
const removeImgInterest = (imgList) => {
state.interest.imageList = imgList
}
/* 删除评价标签 */
const removeTag = (item : any) => {
state.handle.tagList.map((tag, index) => {
if (tag.id === item.id) {
state.handle.tagList.splice(index, 1)
}
})
}

/* 发布 */
const publish = (e) => {
@@ -182,7 +164,7 @@
showLoading: true,
}
console.log("options", options)
request(addEvaluation, options).then((res) => {
requestNew(addEvaluation, options).then((res) => {
addProductInterest()
})
}
@@ -219,21 +201,13 @@
showLoading: true,
}
console.log("options", options)
request(addEvaluation, options).then((res) => {
requestNew(addEvaluation, options).then((res) => {
confirm('您的评价已发布成功！', () => {
uni.$emit('refreshOrder');
uni.navigateBack();
}, '发布成功', false);
})
}
/* 获取业务员标签ID */
const getTagIds = () => {
const list = [];
state.handle.tagList.map((tag) => {
list.push(tag.id);
});
return list;
}

/* 获取订单详情 */
const getOrderDetails = (id) => {
@@ -243,9 +217,9 @@
method: 'POST',
showLoading: true,
}
request(orderDetail, options).then((res) => {
state.orderInfo = stringToJson(res.bizContent);
console.log("获取订单详情", stringToJson(res.bizContent), state.orderInfo.equityId)
requestNew(orderDetailQuery, options).then((res) => {
state.orderInfo = res;
console.log("获取订单详情", res, state.orderInfo.equityId)
})
}
// 是否匿名

+ 7
- 23
subpackage/orders/order-evaluate-salesman.vue 查看文件

@@ -69,13 +69,12 @@
<script setup lang="ts">
import evaluateStar from "./components/evaluate-star.vue"
import { reactive } from "vue";
import { confirm, isBlank, msg } from "@/utils/utils";
import { confirm, msg } from "@/utils/utils";
import tagPopup from "./components/popup-order-evaluate-tag";
import { request } from "@/utils/network/request";
import { orderDetail, orderEvaluateTag, salesmanMsg, addEvaluation, judageSalesman } from "@/utils/network/api";
import { request, requestNew } from "@/utils/network/request";
import { orderDetail, orderEvaluateTag, addEvaluation} from "@/utils/network/api";
import { onLoad } from "@dcloudio/uni-app";
import { stringToJson } from "@/utils/network/encryption";
import { getItem, StorageKeys } from "@/utils/storage";

const state = reactive({
orderInfo: {} as any, //订单信息
@@ -179,7 +178,7 @@
}
console.log("options", options)

request(addEvaluation, options).then((res) => {
requestNew(addEvaluation, options).then((res) => {
addStaff()
})
}
@@ -210,7 +209,7 @@
method: 'POST',
showLoading: true,
}
request(addEvaluation, options).then((res) => {
requestNew(addEvaluation, options).then((res) => {
confirm('您的评价已发布成功！', () => {
uni.$emit('refreshOrder');
uni.navigateBack();
@@ -226,21 +225,6 @@
return list;
}


/* 订单查询业务员简单信息 */
const getSalesmanMsg = (id) => {
const options = {
type: 2,
data: { "id": id },
method: 'POST',
showLoading: true,
}
request(salesmanMsg, options).then((res) => {
console.log("订单查询业务员简单信息", stringToJson(res.bizContent))
state.orderInfo = stringToJson(res.bizContent);
})
}

/* 获取评价标签 */
const getEnvTag = () => {
const options = {
@@ -249,9 +233,9 @@
method: 'POST',
showLoading: true,
}
request(orderEvaluateTag, options).then((res) => {
requestNew(orderEvaluateTag, options).then((res) => {

state.tagAllList = stringToJson(res.bizContent);
state.tagAllList = res;
})
}
// 是否匿名

+ 5
- 5
subpackage/orders/order-evaluate.vue 查看文件

@@ -61,7 +61,7 @@
import { reactive } from "vue";
import { confirm, isBlank, msg } from "@/utils/utils";
import tagPopup from "./components/popup-order-evaluate-tag";
import { request } from "@/utils/network/request";
import { request,requestNew } from "@/utils/network/request";
import { orderDetail, orderEvaluate, orderEvaluateTag, saleMessage } from "@/utils/network/api";
import { onLoad } from "@dcloudio/uni-app";
import { stringToJson } from "@/utils/network/encryption";
@@ -160,7 +160,7 @@
method: 'POST',
showLoading: true,
}
request(orderEvaluate, options).then((res) => {
requestNew(orderEvaluate, options).then((res) => {
confirm('您的评价已发布成功！', () => {
uni.$emit('refreshOrder');
uni.navigateBack();
@@ -199,9 +199,9 @@
method: 'POST',
showLoading: true,
}
request(orderEvaluateTag, options).then((res) => {
console.log("获取评价标签", stringToJson(res.bizContent))
state.tagAllList = stringToJson(res.bizContent);
requestNew(orderEvaluateTag, options).then((res) => {
console.log("获取评价标签", res)
state.tagAllList = res;
})
}


+ 7
- 7
subpackage/orders/order_payment.vue 查看文件

@@ -40,7 +40,7 @@
import navBgCar from "./components/nav-bg-car1";
import navBar from "@/components/nav-bar/nav-bar2.vue";
const imgURL = `${fileURL}image/`;
import { confirm } from "@/utils/utils";
import { confirm,navTo} from "@/utils/utils";
let imageUrl = ""

let logo
@@ -290,9 +290,9 @@
url: "/pages/order/order"
})
} else {
uni.navigateTo({
url: `/subpackage/orders/release-products?orderId=${state.orderId}`,
});
navTo(
`/subpackage/orders/release-products?orderId=${state.orderId}`,
);
}
}
state.dataArray = data.datas;
@@ -367,9 +367,9 @@
url: "/pages/order/order"
})
} else {
uni.navigateTo({
url: `/subpackage/orders/release-products?orderId=${state.orderId}`,
});
navTo(
`/subpackage/orders/release-products?orderId=${state.orderId}`,
);
}

}

+ 4
- 6
subpackage/orders/product-detail.vue 查看文件

@@ -61,7 +61,7 @@
import navBgCar from "./components/nav-bg-car1";
import navBar from "@/components/nav-bar/nav-bar2.vue";
import {
msg
msg,navTo
} from "@/utils/utils";

const savaHandle = () => {
@@ -83,9 +83,9 @@
if (state.checked) {
agreementConfirm().then((value) => {
console.log("协议确认", value)
uni.navigateTo({
url: `/subpackage/orders/order_payment?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&isValueCard=${state.isValueCard}&vehicleId=${state.vehicleId}`,
});
navTo(
`/subpackage/orders/order_payment?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&isValueCard=${state.isValueCard}&vehicleId=${state.vehicleId}`,
);
})

} else {
@@ -358,8 +358,6 @@
}

.value-wrapper {
// margin-top: 40rpx;
// padding: 0rpx 30rpx;
background-color: #fff;
padding: 40rpx 30rpx;
border-radius: 12rpx;

+ 10
- 10
subpackage/orders/release-products.vue 查看文件

@@ -34,24 +34,24 @@
import navBar from "@/components/nav-bar/nav-bar2.vue";
import navBgCar from "./components/nav-bg-car1";
const imgURL = `${fileURL}image/`;
import {navTo} from "@/utils/utils";
const savaHandle = () => {
console.log("执行点击事件");
uni.navigateTo({
url: `/subpackage/orders/choice-product?orderId=${state.orderId}`,
});
navTo(
`/subpackage/orders/choice-product?orderId=${state.orderId}`,
);
};
const qianyueAction = (val) => {
console.log(val);
// #ifdef MP-ALIPAY
uni.navigateTo({
url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
});
navTo(
`/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
);
// #endif
// #ifdef MP-WEIXIN
uni.navigateTo({
url: `/subpackage/orders/sign-up?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
});
navTo(
`/subpackage/orders/sign-up?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
);
// #endif

};

+ 114
- 114
subpackage/personal-center/install-activation-order.vue 查看文件

@@ -1,52 +1,57 @@
<!-- 安装激活-选择订单 -->
<template>
<empty-view :mode="config.emptyHint.mode" :content="config.emptyHint.hint" v-if="params.ordersList.length === 0" />
<view class="list" v-else>
<view class="item" v-for="(item,index) in params.ordersList" :key="index" :item="item">
<view v-else>
<view v-for="(item,index) in params.ordersList" :key="index" :item="item" class="item">
<view class="head">
<view class="name">
<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
<text class="title">{{item.productName ?item.productName: ''}}</text>
<image :src="`${$imgUrl}order/icon-car.png`" class="icon" mode="aspectFit"></image>
<text class="title">{{item.vehiclePlate ?item.vehiclePlate: ''}}</text>
</view>
<view class="status text-orange">{{getOrderStatusName(item.orderStep)}}</view>
<view v-if="item.promotionModes==1" class="xiao">小程序</view>
<view v-else class="xianxia">线下网点</view>
</view>
<view class="detail">
<view class="orders">
<view class="order-text" v-if="item.cardId">
<text class="type">卡号：</text>
<text class="value">{{item.cardId}}</text>
<view class="content">
<view class="picture">
<view>
<view style="padding-bottom: 10rpx;">
<text>车牌颜色：</text>
<text>{{getVehiclePlateColor(item.vehiclePlateColor)}}</text>
</view>
<view>
<text>产品名称：</text>
<text>{{item.productName ?item.productName: ''}}</text>
</view>
</view>
<view class="order-text" v-if="item.obuId">
<text class="type">签号：</text>
<text class="value">{{item.obuId}}</text>
</view>
<!-- <view class="order-text odd">
<text class="type">业务类型：</text>
<text class="value">{{getOrderTypeName(item.orderType)}}</text>
</view> -->
<view class="order-text odd">
<text class="type">订单车牌号：</text>
<text class="value">{{item.vehiclePlate}}</text>
</view>
<view class="order-text ">
<text class="type">订单车牌颜色：</text>
<text class="value">{{getVehiclePlateColor(item.vehiclePlateColor)}}</text>
<view>
<view v-if="item.status==2">
<image class="tupian" :src="`${$imgUrl}order/daishouhuo.png`" mode="aspectFill"></image>
</view>
<view
v-else="item.status==1">
<image class="tupian" :src="`${$imgUrl}order/dajihuo.png`" mode="aspectFill"></image>
</view>
</view>
</view>
<view>
<text class="type">新办订单号：</text>
<text class="value">{{item.orderNo}}</text>
</view>
<view v-if="item.amount" class="all">合计：<text class="cny">￥</text><text class="amount"
>{{item.amount / 100}}</text></view>
</view>
<view class="btns">
<view class="btn btn-primary as-gravity-center" @click="gotoConfirmReceipt(item)"
<view class="btn btn-normal"@click="gotoConfirmReceipt(item)"
v-if="item.status==2">确认收货</view>
<view class="btn btn-primary as-gravity-center" @click="gotoActiveOrder(item)"
<view class="btn btn-primary"@click="gotoActiveOrder(item)"
v-if="item.status==1">去激活</view>
<view class="btn btn-primary as-gravity-center" @click="gotoOnceActivate(item)"
v-if="item.status==3">OBU重新激活</view>
<view class="btn btn-primary"@click="gotoActiveOrder(item)"
v-if="item.status==3">OBU重新激活</view>
</view>
</view>

<uni-load-more :status="params.status" iconType="snow" :icon-size="16" :content-text="config.contentTxt"
v-if="params.ordersList.length > 0" />
</view>
<uni-load-more :status="params.status" iconType="snow" :icon-size="16" :content-text="config.contentTxt"
v-if="params.ordersList.length > 0" />
</template>

<script setup lang="ts">
@@ -150,8 +155,6 @@
type: 2,
data: {
"opId": getItem(StorageKeys.OpenId),
// "pageNo": params.pageNo,
// "pageSize": params.pageSize,
},
method: 'POST',
showLoading: params.pageNo === 1 ? true : false,
@@ -295,10 +298,6 @@ const ndActivateVerificationQuery = () => {
onPullDownRefresh(() => {
refreshList();
});

// onReachBottom(() => {
// loadMore();
// });
</script>

<style>
@@ -307,99 +306,112 @@ const ndActivateVerificationQuery = () => {
}
</style>
<style lang="scss" scoped>
.list {
padding: 30rpx 30rpx 0rpx;
display: flex;
flex-direction: column;
}

.list .item {
.item {
background: #ffffff;
box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
border-radius: 20rpx;
box-sizing: border-box;
display: flex;
flex-direction: column;
margin-bottom: 30rpx;
margin: 30rpx 30rpx 0rpx;
}

.list .item .head {
.item .head {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20rpx 28rpx;
padding: 20rpx 0;
border-bottom: 1px solid #dcdcdc;
width: 95%;
margin: 0 auto;
}

.list .item .head .icon {
width: 48rpx;
height: 48rpx;
.item .head {
.head-row {
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
}
.name>text {
font-size: 26rpx;
font-family: Noto Sans S Chinese;
font-weight: 400;
color: #999999;
line-height: 36rpx;
margin-left: 6rpx;
}
}

.list .item .head .name {
.item .head .icon {
width: 37rpx;
height: 31rpx;
}
.item .head .name {
display: flex;
align-items: center;
}

.list .text-green {
font-size: 26rpx;
color: #00b38b;
.xiao {
background: #42D175;
border-radius: 5rpx 5rpx 5rpx 5rpx;
color: white;
font-size: 20rpx;
padding: 4rpx 6rpx;
}

.list .text-orange {
font-size: 26rpx;
color: #ff8000;
.xianxia {
background: #CCB375;
border-radius: 5rpx 5rpx 5rpx 5rpx;
color: white;
font-size: 20rpx;
padding: 4rpx 6rpx;
}

.list .title {
font-size: 30rpx;
color: #333;
.content {
font-size: 26rpx;
padding: 6rpx 20rpx;
}

.list .detail {
.picture {
display: flex;
justify-content: space-between;
align-items: center;
padding: 30rpx 32rpx;
justify-content: space-between;
margin: 10rpx 0;
}

.list .detail .type {
.picture>view:first-child {
width: 65%;
}
.tupian {
width: 90rpx;
height: 80rpx;
}
.type {
font-size: 26rpx;
color: #999;
}

.list .detail .value {
.value {
font-size: 26rpx;
color: #333;
}

.list .finished .detail .value {
color: #999;
}

.list .detail .odd {
margin: 20rpx 0;
.all {
display: flex;
justify-content: flex-end;
align-items: center;
margin-top: 10rpx;
}

.list .cny {
.cny {
font-size: 26rpx;
color: #333;
}

.list .finished .cny {
color: #999;
}

.list .amount {
.amount {
font-size: 40rpx;
font-weight: bold;
}

.list .finished .amount {
color: #999;
}

.list .btns {
.btns {
position: relative;
display: flex;
align-items: center;
justify-content: flex-end;
@@ -407,28 +419,16 @@ const ndActivateVerificationQuery = () => {
margin: 0 30rpx;
padding: 20rpx 0;
}

.list .btn {
.btn {
height: 60rpx;
// line-height: 60rpx;
line-height: 58rpx;
border-radius: 30rpx;
padding: 0 24rpx;
font-size: 26rpx;
font-size: 23rpx;
box-sizing: border-box;
margin-right: 20rpx;
}

.list .btns .btn:last-child {
margin: 0;
}

.list .btn-primary {
border: 1px solid #00b38b;
color: #00b38b;
}

.list .btn-normal {
border: 1px solid #dcdcdc;
color: #333;
.btn-primary {
color: white;
background-color: #133850;
}
</style>

+ 3
- 4
subpackage/personal-center/remind/evaluate-list.vue 查看文件

@@ -26,8 +26,7 @@
import evaluateSalesmanItem from "./components/evaluate-salesman-item";
import { onLoad, onReachBottom } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { request } from "@/utils/network/request";
import { stringToJson } from "@/utils/network/encryption";
import { requestNew } from "@/utils/network/request";
import { satisfactionEvaluation } from "@/utils/network/api";
import { getItem, StorageKeys } from "@/utils/storage";
const state = reactive({
@@ -121,12 +120,12 @@
method: "POST",
showLoading: true,
};
request(satisfactionEvaluation, options).then((res) => {
requestNew(satisfactionEvaluation, options).then((res) => {
//若不填评价内容，根据打分规则自动填充评价内容
//差评展示：默认差评 2.5分及以下
//中评展示：默认中评 2.5以上4.0以下
//好评展示：默认好评 4.0及4.0以上
const data = stringToJson(res.bizContent).data;
const data = res.result;
console.log("stringToJson(res.bizContent)1", data)
if (data) {
for (var i = 0; i < data.length; i++) {

+ 3
- 4
subpackage/service/remind/evaluate-list.vue 查看文件

@@ -26,8 +26,7 @@
import evaluateSalesmanItem from "./components/evaluate-salesman-item";
import { onLoad, onReachBottom } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { request } from "@/utils/network/request";
import { stringToJson } from "@/utils/network/encryption";
import { requestNew } from "@/utils/network/request";
import { satisfactionEvaluation } from "@/utils/network/api";
import { getItem, StorageKeys } from "@/utils/storage";
const state = reactive({
@@ -117,12 +116,12 @@
method: "POST",
showLoading: true,
};
request(satisfactionEvaluation, options).then((res) => {
requestNew(satisfactionEvaluation, options).then((res) => {
//若不填评价内容，根据打分规则自动填充评价内容
//差评展示：默认差评 2.5分及以下
//中评展示：默认中评 2.5以上4.0以下
//好评展示：默认好评 4.0及4.0以上
const data = stringToJson(res.bizContent).data;
const data = res.result;
console.log("stringToJson(res.bizContent)1", data)
if (data) {
for (var i = 0; i < data.length; i++) {

+ 6
- 9
utils/network/api.js 查看文件

@@ -93,8 +93,6 @@ export const cancelOrder = "7"; //取消订单
export const cancelOrderNew = "7fba19ba5d354c0ea5c443f9b5c66cdf"; //取消订单(新)
export const receiveOrder = "155"; //订单完成收货
export const editOrderAddr = '164'; //订单修改收货地址
export const orderEvaluate = '169'; //评价订单
export const orderEvaluateTag = '170'; //获取服务评价标签
export const salesmanMsg = '9f19be89a03e475b903b88d4bc91cbb4' //订单查询业务员简单信息

//个人中心
@@ -177,12 +175,6 @@ export const gongWuSupplementObu = "97"; //公务车增补obu接口

export const addProduct = "10414819633f46db98158fc7b4e8475e" //加购权益产品

export const queryDetails = "8" //查详情
export const addEvaluation = "64ed1fdff3b44138ba30d183b613bc7f" //满意度评价-新增
export const satisfactionEvaluation = "746b5e0375b8474eb3e133b8c79586d8" //满意度评价-分页查询
export const judageSalesman = "35744a8e282a42ddbc63814303e9e441" //判断是否有业务员
export const judageQuanProduct = "fe71273c1a394eaa999825afe7daa59b" //判断是否有权益产品

// 单位账户充值
export const accountLogin = "308679d555fa47da84876a8aeaee40a4" //单位账户登录
export const openRecharge = "3d68404d529d4b30963c6d3638003e6f " //单位账户开户
@@ -448,4 +440,9 @@ export const channelSingQueryApi = "/iaw/sign/wxsigninfo"
// 支付宝接口
export const getZfbOpenid = "/iaw/alipay/system/getAlipayOpenId" // 获取支付宝Openid支付宝
export const obtainUserId = "/iaw/trafficsupple/obtainuserid"; //获取第三方用户标识
export const PAYMENTORDERAPPLY = "/iaw/issue/order/payApply" //支付申请
export const PAYMENTORDERAPPLY = "/iaw/issue/order/payApply" //支付申请
// 满意度评价接口
export const orderEvaluate = '/iaw/issue/evaluate/appraise'; //评价订单
export const orderEvaluateTag = '/iaw/issue/evaluate/label'; //获取服务评价标签
export const addEvaluation = "/iaw/issue/evaluate/add" //满意度评价-新增
export const satisfactionEvaluation = "/iaw/issue/evaluate/page" //满意度评价-分页查询

+ 1
- 1
utils/network/difference.js 查看文件

@@ -9,7 +9,7 @@ export const source = "WECHAT" //WECHAT
// 微信小程序渠道编号：52010106004 支付宝小程序52010106998
// 渠道编号
// #ifdef MP-ALIPAY
export const agentId = "52010188937"
export const agentId = "52010106004"
// #endif
// #ifdef MP-WEIXIN
export const agentId = "52010106004" //

+ 6
- 1
utils/network/request.js 查看文件

@@ -337,8 +337,13 @@ export function requestNew(code, options = {}, start = false) {
// accessToken: getItem(StorageKeys.Token),
openId: getItem(StorageKeys.OpenId),
opId: getItem(StorageKeys.OpenId),
orderSource:'WECHAT'
}
// #ifdef MP-ALIPAY
Common['orderSource'] = "ALI"
// #endif
// #ifdef MP-WEIXIN
Common['orderSource'] = "WECHAT"
// #endif
// options.url = envs[process.env.NODE_ENV].baseUrl+'/prod' + code
options.url = envs[process.env.NODE_ENV].baseUrl+'/ndev' + code
//默认json数据格式提交`

+ 18
- 4
utils/utils.ts 查看文件

@@ -53,7 +53,6 @@ export const navTo = (url : string = "", login : boolean = false) => {
if (!url) {
return;
}

if (login && !hasLogin()) {
confirm('您需要登录过后才能使用此功能', () => {
uni.navigateTo({
@@ -61,9 +60,24 @@ export const navTo = (url : string = "", login : boolean = false) => {
});
}, '温馨提示', true, '去登录');
} else {
uni.navigateTo({
url,
});
let pages = getCurrentPages();
// 获取页面栈总页数
// this.pagesCount = pages.length;
// 如果页面栈总数大于10
console.log("pages.length",pages.length)
if(pages.length >= 10){
// 使用重定向跳转页面
uni.redirectTo({
url
})
}else{
// 如果页面栈总数小于10，则打开新页面
uni.navigateTo({
url,
});
}

}
};


Write Preview
Loading…
取消
儲存