Merge branch 'master' of http://git.scdxtc.com/chen/flying-monkey

pages/dataQuery/client.vue

@@ -36,7 +36,12 @@
 		},
 		data() {
 			return {
-
+             dataList:[
+                 {
+                     name:'湖南争鸣光电科技有限公司',
+                     code:"KH20220304-002"
+                 }
+             ],
 			}
 		},
 		methods: {

pages/dataQuery/details.vue

@@ -18,6 +18,7 @@
                 </view>
             </view>
             <view class="details-content">
+                
                 <view class="title">
                     <image class="img" src="../../static/iocn/dn.png" mode=""></image>
                     <text class="text">基本信息</text>
@@ -173,6 +174,9 @@
             }
         },
         methods: {
+            getData(){
+                
+            },
             bindTimeChange() {
 
             }

pages/dataQuery/queryFunction.vue

@@ -17,16 +17,18 @@
             </view>
         </view>
         <view class="recently-query-title">最近查询</view>
-        <view class="recently-query-content">
+        <view class="recently-query-content" v-for="(item,index) in recentlyQuery ">
-            <view class="li">
+            <view class="li" @click="goDetail()">
                 <image class="icon" src="../../static/iocn/jfd.png" mode=""></image>
                 <view class="text-content">
-                    <view class="title">湖南争鸣光电科技有限公司</view>
+                    <view class="title clips1">{{item.name}}</view>
-                    <view class="text">编号：FRID23123141123321124</view>
+                    <view class="text">编号：{{item.code}}</view>
-                    <view class="text">2121-1-8 12:23</view>
+                    <view class="text">{{item.date}}</view>
                 </view>
             </view>
         </view>
+
+
         <view class="imgJCon">
             <image class="imgJ" src="../../static/iocn/jh.png" mode=""></image>
         </view>
@@ -38,6 +40,117 @@
         data() {
             return {
                 dataIndex: 0,
+                recentlyQuery: [],
+                customerQuery: [{
+                        name: "湖南争鸣光电科技有限公司",
+                        code: "FRID23123141123321124",
+                        date: "2121-1-8 12:23",
+                        img: "../../static/iocn/jfd.png"
+                    },
+                    {
+                        name: "湖南争鸣光电科技有限公司a",
+                        code: "FRID23123141123321124",
+                        date: "2121-1-8 12:23",
+                        img: "../../static/iocn/jfd.png"
+                    },
+                    {
+                        name: "湖南争鸣光电科技有限公司b",
+                        code: "FRID23123141123321124",
+                        date: "2121-1-8 12:23",
+                        img: "../../static/iocn/jfd.png"
+                    },
+                    {
+                        name: "湖南争鸣光电科技有限公司c",
+                        code: "FRID23123141123321124",
+                        date: "2121-1-8 12:23",
+                        img: "../../static/iocn/jfd.png"
+                    }
+                ],
+                projectQuery: [
+
+                    {
+                        name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                        img: "../../static/del/img001.png",
+                        code: "20220108-1001",
+                        model: "DS-CK25FI/H",
+                        size: "3.94ｍ*2.02ｍ",
+                        installationSite: "xxx综合楼2楼会议室",
+                        address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                        date: "2022/01/08",
+                        state: 1
+
+                    },
+                    {
+                        name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                        img: "../../static/del/img001.png",
+                        code: "20220108-1001",
+                        model: "DS-CK25FI/H",
+                        size: "3.94ｍ*2.02ｍ",
+                        installationSite: "xxx综合楼2楼会议室",
+                        address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                        date: "2022/01/08",
+                        state: 2
+
+                    },
+                    {
+                        name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                        img: "../../static/del/img001.png",
+                        code: "20220108-1001",
+                        model: "DS-CK25FI/H",
+                        size: "3.94ｍ*2.02ｍ",
+                        installationSite: "xxx综合楼2楼会议室",
+                        address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                        date: "2022/01/08",
+                        state: 2
+
+                    },
+                    {
+                        name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                        img: "../../static/del/img001.png",
+                        code: "20220108-1001",
+                        model: "DS-CK25FI/H",
+                        size: "3.94ｍ*2.02ｍ",
+                        installationSite: "xxx综合楼2楼会议室",
+                        address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                        date: "2022/01/08",
+                        state: 1
+
+                    },
+                    {
+                        name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                        img: "../../static/del/img001.png",
+                        code: "20220108-1001",
+                        model: "DS-CK25FI/H",
+                        size: "3.94ｍ*2.02ｍ",
+                        installationSite: "xxx综合楼2楼会议室",
+                        address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                        date: "2022/01/08",
+                        state: 0
+
+                    },
+
+                ],
+                spareQuery: [{
+                        name: "湖南工业大学生化学院三楼会议室",
+                        date: "2021-04-06 16:45:45"
+
+                    },
+                    {
+                        name: "湖南工业大学生化学院三楼会议室",
+                        date: "2021-04-06 16:45:45"
+
+                    },
+                    {
+                        name: "湖南工业大学生化学院三楼会议室",
+                        date: "2021-04-06 16:45:45"
+
+                    },
+                    {
+                        name: "湖南工业大学生化学院三楼会议室",
+                        date: "2021-04-06 16:45:45"
+
+                    },
+                ],
                 dataList: [{
                         title: "客户查询",
                     },
@@ -58,6 +171,19 @@
             // 查询类型切换
             navIndex(index) {
                 this.dataIndex = index
+                if (this.dataIndex == 0) {
+                    this.recentlyQuery = [...this.customerQuery]
+                } else if (this.dataIndex == 1) {
+                    this.recentlyQuery = [...this.projectQuery]
+                } else {
+                    this.recentlyQuery = [...this.spareQuery]
+
+                }
+
+            },
+            // 获取最近查询
+            getData(){
+                
             },
             // 查询事件
             checkEv(index) {
@@ -69,7 +195,24 @@
                 uni.navigateTo({
                     url: `${urls[index]}?key_word=${this.key_word}`
                 })
+            },
+
+            goDetail() {
+                if (this.dataIndex == 1) {
+                    uni.navigateTo({
+                        url: "/pages/project/details"
+                    })
+                } else if (this.dataIndex == 0) {
+                    uni.navigateTo({
+                        url: '/pages/dataQuery/details'
+                    })
+                } else {
+                 uni.navigateTo({
+                     url: '/pages/dataQuery/dataQuery'
+                 })
                 }
+            },
+
         }
     }
 </script>
@@ -208,10 +351,15 @@
         margin-right: 40rpx;
     }
 
+    .recently-query-content .li .text-content {
+        flex: 1;
+    }
+
     .recently-query-content .li .text-content .title {
         color: #30364c;
         font-size: 33rpx;
         margin-bottom: 25rpx;
+        padding-right: 50rpx;
     }
 
     .recently-query-content .li .text-content .text {
@@ -236,4 +384,205 @@
         height: 40rpx;
         margin-top: 180rpx;
     }
+
+    .project-list .li {
+        width: 710rpx;
+        box-sizing: border-box;
+        background-color: #FFFFFF;
+        position: relative;
+
+        margin: auto;
+        margin-bottom: 20rpx;
+        padding: 33rpx 23rpx;
+    }
+
+    .project-list .li .icon {
+        width: 135rpx;
+        height: 40rpx;
+        position: absolute;
+        font-size: 24rpx;
+        color: #FFFFFF;
+        right: 23rpx;
+        line-height: 40rpx;
+        text-align: center;
+        background-size: 100% 100%;
+        top: -10rpx;
+
+
+    }
+
+    .project-list .li .iconBer {
+        background-image: url(../../static/iocn/za.png);
+    }
+
+    .project-list .li .iconBera {
+        background-image: url(../../static/iocn/zac.png);
+    }
+
+    .project-list .li .iconBerb {
+        background-image: url(../../static/iocn/lsxm.png);
+    }
+
+    .project-list .li .message {
+        display: flex;
+
+    }
+
+    .project-list .li .message .img {
+        width: 230rpx;
+        margin-right: 11rpx;
+        height: 180rpx;
+
+    }
+
+    .project-list .li .message .text {
+        flex: 1;
+    }
+
+    .project-list .li .message .text .title {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        word-wrap: break-word;
+        word-break: break-all;
+        margin-bottom: 15rpx;
+        font-size: 28rpx;
+        line-height: 30rpx;
+        color: #333333;
+        font-weight: bold;
+    }
+
+    .project-list .li .message .serial-number {
+        color: #ff8800;
+        font-size: 24rpx;
+        margin-bottom: 15rpx;
+        line-height: 24rpx;
+    }
+
+    .project-list .li .message .specification {
+        color: #00b1ff;
+        font-size: 24rpx;
+        margin-bottom: 15rpx;
+        line-height: 24rpx;
+    }
+
+    .project-list .li .message .installation-site {
+        color: #6b6a6a;
+        font-size: 24rpx;
+        margin-bottom: 15rpx;
+        line-height: 24rpx;
+    }
+
+    .project-list-address {
+        display: flex;
+        margin-top: 10rpx;
+        /* justify-content: space-between; */
+    }
+
+    .project-list-address .text {
+        font-size: 24rpx;
+    }
+
+    .project-list-address .date {
+        font-size: 24rpx;
+        text-align: right;
+        margin-left: 20rpx;
+        margin-top: 12rpx;
+    }
+
+    .project-list-address .img {
+        width: 23rpx;
+        height: 28rpx;
+        margin-right: 10rpx;
+    }
+
+    .project-list-address .address {
+        display: flex;
+        color: #666666;
+        align-items: center;
+
+    }
+
+    .dataQuery-content {
+        font-size: 24rpx;
+        color: #333333;
+        margin-top: 15rpx;
+    }
+
+    .dataQuery-content .li {
+        background-color: #FFFFFF;
+        padding: 26rpx 28rpx;
+
+
+        margin-bottom: 14rpx;
+    }
+
+    .dataQuery-content .li {
+        position: relative;
+    }
+
+    .dataQuery-content .li .text-content {
+        display: flex;
+        border-bottom: 2rpx solid #EEEEEE;
+        padding-bottom: 10rpx;
+
+    }
+
+    .dataQuery-content .li .text-content .left {
+        width: 48%;
+    }
+
+    .dataQuery-content .li .text-content .text {
+        margin-top: 20rpx;
+    }
+
+    .cor {
+        color: #ff9000;
+    }
+
+    .cor1 {
+        color: #999999;
+    }
+
+    .dataQuery-content .li .icon {
+        background-image: url(../../static/iocn/zc.png);
+        width: 125rpx;
+        height: 91rpx;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        background-size: 100%;
+        padding-left: 30rpx;
+        right: 20rpx;
+        top: 20rpx;
+        position: absolute;
+    }
+
+    .dataQuery-content .li .icon .icon-text {
+        transform: rotateZ(20deg);
+        color: #53e5d0;
+
+    }
+
+    .dataQuery-content .li .icon1 {
+        background-image: url(../../static/iocn/dwx.png);
+        width: 125rpx;
+        height: 91rpx;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        background-size: 100%;
+        padding-left: 30rpx;
+        right: 20rpx;
+        top: 20rpx;
+        position: absolute;
+    }
+
+    .dataQuery-content .li .icon1 .icon-text {
+        transform: rotateZ(20deg);
+        color: #ff0006;
+
+    }
 </style>

pages/feedback/feedback.vue

@@ -5,12 +5,16 @@
             <view slot="content" style="margin: 0 -30rpx;">
                 <view class="opinion-type">意见类型</view>
                 <view class="opinion-type-content">
-                    <view class="li" @click="opinionType(index)" :class="typeNum==index ? 'on':''" v-for="(item,index) in typeData">{{item.title}}</view>
+                    <view class="li" @click="opinionType(index)" :class="typeNum==index ? 'on':''"
+                        v-for="(item,index) in typeData">{{item.title}}</view>
                 </view>
                 <view class="feedback-input">
-                    <input type="text" v-model="opinion" class="inputCss" placeholder="请填写您的意见或建议内容" placeholder-class="inputCss-input" />
+                    <input type="text" v-model="opinion" class="inputCss" placeholder="请填写您的意见或建议内容"
-                    <input type="text" v-model="name" class="inputCss" placeholder="请输入联系人姓名" placeholder-class="inputCss-input" />
+                        placeholder-class="inputCss-input" />
-                    <input type="text" v-model="phone" class="inputCss" placeholder="请输入联系人电话" placeholder-class="inputCss-input" />
+                    <input type="text" v-model="name" class="inputCss" placeholder="请输入联系人姓名"
+                        placeholder-class="inputCss-input" />
+                    <input type="text" v-model="phone" class="inputCss" placeholder="请输入联系人电话"
+                        placeholder-class="inputCss-input" />
                     <view class="fault-pictures" @tap="chooseImg">
                         <image :src="imgSrc" v-if="imgSrc!=''" mode="aspectFill" lazy-load style="width: 100%;"></image>
                         <view class="disjcac fc" v-if="imgSrc==''">
@@ -55,13 +59,30 @@
         data() {
             return {
                 isReturn: false,
-                typeData: [
+                typeData: [{
-					{title: "未解决问题",state: false},
+                        title: "未解决问题",
-                    {title: "处理不及时",state: false},
+                        state: false
-                    {title: "软件问题",state: false},
+                    },
-                    {title: "报修问题",state: false},
+                    {
-                    {title: "服务投诉",state: false},
+                        title: "处理不及时",
-                    {title: "其他问题反馈",state: false},
+                        state: false
+                    },
+                    {
+                        title: "软件问题",
+                        state: false
+                    },
+                    {
+                        title: "报修问题",
+                        state: false
+                    },
+                    {
+                        title: "服务投诉",
+                        state: false
+                    },
+                    {
+                        title: "其他问题反馈",
+                        state: false
+                    },
                 ],
                 typeNum: 0,
                 opinion: '',
@@ -114,17 +135,34 @@
             },
             // 图片选择事件
             chooseImg() {
+                console.log( uni.getStorageSync('token'))
                 uni.chooseImage({
-					count:1,
+                    success: (chooseImageRes) => {
-					sourceType:['album','camera'],
+                        const tempFilePaths = chooseImageRes.tempFilePaths;
-					success: (res) => {
+                        this.imgSrc = chooseImageRes.tempFilePaths[0]
-						this.imgSrc = res.tempFilePaths[0]
+                        uni.uploadFile({
+                            url: getApp().globalData.hostapi +
+                            '/universal/api.upload/upload', //仅为示例，非真实的接口地址
+                            filePath: tempFilePaths[0],
+                            name: 'image',
+                            formData: {
+                                token: uni.getStorageInfoSync("token")
+                            },
+                            success: (uploadFileRes) => {
+
+
                             }
-				})
+                        });
+                    }
+                });
+
             },
             // 查询意见反馈类型
             checkFeedback() {
-				this.$requst.get('/universal/api.feedback/feedback_type',{page:1,list_rows:20}).then(res=>{
+                this.$requst.get('/universal/api.feedback/feedback_type', {
+                    page: 1,
+                    list_rows: 20
+                }).then(res => {
 
                 })
             },

pages/mountingsList/mountingsList.vue

@@ -11,16 +11,16 @@
             </view>
         </view>
         <view class="mountings-list">
-            <view class="li" v-for="(item,index) in dataList">
+            <view class="li" v-for="(item,index) in dataList.data">
                 <view class="textCon">
                     <view class="imgCon">
-                        <image src="../../static/del/img001.png" class="img" mode="aspectFill"></image>
+                        <image :src="item.images" class="img" mode="aspectFill"></image>
                     </view>
 
                     <view class="text">
                         <view class="title">
                             <view class="">
-                                {{item.title}}
+                                {{item.name}}
                             </view>
                             <view class="ispitchOn" @click="ispitchOnFun(item)">
                                 <image v-if="item.isJob" src="../../static/iocn/pxz.png" class="icon1" mode=""></image>
@@ -30,15 +30,15 @@
                             </view>
                         </view>
                         <view class="brand p">
-                            配件品牌：卡莱特
+                            配件品牌：{{item.brand}}
                         </view>
                         <view class="model p">
-                            规格型号：5A-75E
+                            规格型号{{item.model}}
                         </view>
                         <view class="num p">
 
                             <view class="">
-                                已用数量：109张
+                                已用数量：{{item.remark}}张
                             </view>
                             <view class="numBtn">
                                 <view class="subtract" @click="subtractFun(item)">
@@ -82,41 +82,15 @@
         data() {
             return {
                     statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
-                dataList: [{
+               dataList: {
-                        title: "全彩LED显示屏接收卡",
+                   list_rows: 10,
-                        state: true,
+                   page: 1,
-                        isJob: true,
+                   data:{},
-                        num: 1,
-                        price: 2500,
-                        sum: 2500,
-                    },
-                    {
-                        title: "全彩LED显示屏接收卡",
-                        state: false,
-                        isJob: true,
-                        num: 1,
-                        price: 2500,
-                        sum: 2500,
-                    },
-                    {
-                        title: "全彩LED显示屏接收卡",
-                        state: true,
-                        num: 1,
-                        price: 2500,
-                        sum: 2500,
-                        isJob: false,
-                    },
-                    {
-                        title: "全彩LED显示屏接收卡",
-                        state: true,
-                        num: 1,
-                        price: 2500,
-                        sum: 2500,
-                        isJob: false,
-
-                    },
-                ]
                 }
+            }
+        },
+        onLoad() {
+           this.getData() 
         },
         methods: {
             ispitchOnFun(item) {
@@ -129,7 +103,26 @@
                 }
 
             },
+            getData() {
+                this.$requst.post('/universal/api.accessory/accessory_list', {
+                    list_rows: this.dataList.list_rows,
+                    page: this.dataList.page,
+                }).then(res => {
+                    // this.$toolAll.tools.showToast(res.msg);
+                    console.log(res.data,"---")
+                    if (res.code == 1) {
+                        
+                        this.dataList.data = res.data
+                        for (var i = 0; i <  this.dataList.data.length; i++) {
+                             this.$set(this.dataList.data,i,{num:1,...this.dataList.data[i],sum:this.dataList.data[i].price,isJob:false})
+                        }
+                    } else {
+            
+                    }
+                })
+            },
             addFun(item) {
+                console.log(item)
                 item.num++
                 item.sum = item.price * item.num
             }

pages/project/projectList.vue

@@ -198,7 +198,7 @@
             }
         },
         onLoad() {
-            // this.getData()
+            this.getData()
 
         },
         methods: {

pages/tabbar/my/my.vue

@@ -100,12 +100,13 @@
 					{imgsrc:'/static/public/icon-my-evaluate.png',title:'我要评价'},
 					{imgsrc:'/static/public/icon-my-account.png',title:'我的账户'},
 					{imgsrc:'/static/public/icon-my-set.png',title:'设置'},
-				]
+				],
+                userInfo:{}
 			}
 		},
 		onShow() {
 			// 查询用户信息
-			// this.checkInfo();
+			this.checkInfo();
 		},
 		onPageScroll(e) {
 			let navHeight = uni.getSystemInfoSync().statusBarHeight + 50;
@@ -144,13 +145,10 @@
 				})
 			},
 			checkInfo(){
-				this.$requst.post('/api/user/info').then(res=>{
+				this.$requst.get('/universal/api.user/user_center').then(res=>{
-					// console.log('用户信息：',res);
+					if(res.code==1 && res.data.length!=1) {
-					if(res.code==0 && res.data.length!=0) {
 						this.userInfo = res.data;
-						this.orderStatus[0].num = this.userInfo.order_count.waiting;//待付款
+
-						this.orderStatus[1].num = this.userInfo.order_count.paid;//待发货
-						this.orderStatus[2].num = this.userInfo.order_count.shipped;//待收货
 					}
 				})
 			},

pages/tabbar/pagehome/pagehome.vue

@@ -241,7 +241,7 @@
 		},
 		data() {
 			return {
-				role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
+				role: 1, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量
 				noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
@@ -317,9 +317,9 @@
 			// 获取当前页面url
 			this.$toolAll.tools.obtainUrl();
 			// 调用解决方案类型事件
-			// this.getPlanType();
+			this.getPlanType();
 			// 调用增值服务类型
-			// this.getIncrementServiceType();
+			this.getIncrementServiceType();
 			// 调用获取常见故障列表事件
 			this.getFaultsList();
 		},

pagesB/electronic-certificate/electronic-certificate.vue

@@ -39,8 +39,20 @@
 				website:'WWW.12345678910.com'
 			}
 		},
+        onLoad() {
+            this.getEletronic()
+        },
 		methods: {
+			getEletronic(){
                 
+                this.$requst.get('/universal/api.user/electronic_badge').then(res=>{
+                	if(res.code==1){
+                     
+                		// uni.navigateBack({delta:1})
+                    
+                	}
+                })
+            }
 		}
 	}
 </script>

pagesB/personal-information/personal-information.vue

@@ -106,25 +106,27 @@
 			sumbmitData(){
 				if(this.checkEmpty()){
 					if(this.flag) {
-						this.flag = false;
+						// this.flag = false;
 						let params = {
-							a:this.nickname,
+							nickname:this.nickname,
-							b:this.full_name,
+							name:this.full_name,
-							c:this.genderNum,
+							sex:this.genderNum,
-							d:this.contact_number,
+							phone:this.contact_number,
-							e:this.e_mail,
+							email:this.e_mail,
-							f:this.id_card_no,
+							idcard:this.id_card_no,
 							g:this.imgList[0] || '',
-							h:this.imgList[1] || '',
+							accident_insurance:this.imgList[1] || '',
-							i:this.imgList[2] || '',
+							agreement_document:this.imgList[2] || '',
-							k:this.imgList[3] || ''
+							skills_certificate:this.imgList[3] || ''
 						}
-						console.log(params,119);
+			
-						// this.$requst.post('',params).then(res=>{
+						this.$requst.post('/universal/api.user/user_info',params).then(res=>{
-						// 	if(res.code){
+							if(res.code==1){
-								uni.navigateBack({delta:1})
+                             
-						// 	}
+								// uni.navigateBack({delta:1})
-						// })
+                            
+							}
+						})
 					} else {
 						this.$toolAll.tools.showToast('请勿重复提交');
 					}

pagesB/set-up/set-up.vue

@@ -80,6 +80,7 @@
 		onLoad() {
 			// 调用获取缓存数据的大小
 			this.getStorageDataNum();
+            this.getSettings()
 		},
 		methods: {
 			// 获取缓存数据的大小
@@ -112,6 +113,16 @@
 					url:'/pages/forget/forget'
 				})
 			},
+            // 设置
+            getSettings(){
+                this.$requst.post('/universal/api.settings/settings').then(res=>{
+                	if(res.code==1){
+                     
+                		// uni.navigateBack({delta:1})
+                    
+                	}
+                })
+            },
 			// 清除缓存事件
 			cleanEv(){
 				console.log('清除缓存事件');