Merge branch 'work_tab_bar' into data-page

1 year ago · d86e47e9d7
10 changed files with 213 additions and 80 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,29 +1,13 @@
 {
  "name": "epmet-work-mp",
  "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
  "requires": true,
-  "packages": {
-    "": {
-      "name": "epmet-work-mp",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "@vant/weapp": "^1.11.2"
-      },
-      "devDependencies": {}
-    },
-    "node_modules/@vant/weapp": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.11.2.tgz",
-      "integrity": "sha512-NlZQEW4ijxD1GAmTY0dz2mEw0KWff9DSi5k5WGl1YS19qGp1l3BssID/uBnzrC82HjWH/Sb5V9+r7/YEcfnBPQ=="
-    }
-  },
  "dependencies": {
    "@vant/weapp": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.11.2.tgz",
-      "integrity": "sha512-NlZQEW4ijxD1GAmTY0dz2mEw0KWff9DSi5k5WGl1YS19qGp1l3BssID/uBnzrC82HjWH/Sb5V9+r7/YEcfnBPQ=="
+      "version": "1.11.4",
+      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.11.4.tgz",
+      "integrity": "sha512-egOsWO4hVMP1SQSqQ46jy8UD3WysvlnUecRzPM21Y3ovkOFZ6wlaO7oHQmTXRpwr+V41Qri1qEbtNjhVxFqdyw=="
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -4,7 +4,7 @@
  "description": "{\r                 \"pagePath\": \"pages/information/information\",\r                 \"text\": \"数据\",\r                 \"iconPath\": \"images/home/information.png\",\r                 \"selectedIconPath\": \"images/home/informationSelected.png\"\r },",
  "main": ".eslintrc.js",
  "dependencies": {
-    "@vant/weapp": "^1.11.2"
+    "@vant/weapp": "^1.11.4"
  },
  "devDependencies": {},
  "scripts": {
--- a/pages/work1/work1.js
+++ b/pages/work1/work1.js
@ -0,0 +1,66 @@
+// pages/work1/work1.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
--- a/pages/work1/work1.wxml
+++ b/pages/work1/work1.wxml
@ -0,0 +1,2 @@
+<!--pages/work1/work1.wxml-->
+<text>pages/work1/work1.wxml</text>
--- a/project.private.config.json
+++ b/project.private.config.json
@ -9,6 +9,17 @@
    "condition": {
        "miniprogram": {
            "list": [
+                {
+                    "name": "subpages/communitySelfInsp/pages/historyQuery/historyQuery",
+                    "pathName": "subpages/communitySelfInsp/pages/historyQuery/historyQuery",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null,
+                    "partialCompile": {
+                        "enabled": true,
+                        "pages": []
+                    }
+                },
                {
                    "name": "工作2",
                    "pathName": "pages/work2/work2",
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js
@ -6,7 +6,7 @@ Page({
     * 页面的初始数据
     */
    data: { 
-        title:'社区满意度自查',
+        title:'',
        tableData:[],
        lowerThreshold:'10',
        loadMoreVisible:false,
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.json
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.json
@ -1,5 +1,5 @@
 {
-    "navigationStyle": "custom",
+    "navigationBarTitleText": "满意度调查",
    "usingComponents": {
        "load-more": "../../../../components/loadMore/loadMore",
        "no-data": "../../../../components/noData/nodata"
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
@ -1,18 +1,25 @@
-<view class="header">
-    <image src="../../../../images/back.png" class="back" style=" top: {{statusHeight}}px;width: 50rpx;height: 50rpx;" bindtap="back" mode="" />
-    <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
-        {{title}}
+
+<view class="list_1">
+    <view class="list1_1">
+        <text class="test_1">{{item.agencyName}}{{item.monthName}}月份满意度自查</text>
+        <text class="test_2">{{item.status == 1?'进行中':'已结束'}}</text>
+    </view>
+    <view class="list_2">
+        <text class="test_3">已提交人数：{{item.personQty}}</text>
+    </view>
+    <view class="list_3">
+        <button style="font-weight: 30;" class="button1" open-type="share" bind:tap="share" data-item="{{item}}">一键分享</button>
+        <button style="font-weight: 30;" class="button"  wx:key="index" data-item="{{item}}" bind:tap="handelClickedit">查看统计</button>
    </view>
 </view>
 <view class="content">
-
    <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
        <view class="card">
            <view class="list_card {{index == 0?'bgc':''}}" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" bind:tap="handelClickedit">
                <view class="left">
                    <view class="{{item.status == 1?'bold':''}}"> {{item.agencyName}}{{item.monthName}}月份满意度自查</view>
                    <view class="left_bto_box">
-                        <view class="{{item.status == 1?'bule':'gray'}}">{{item.status == 1?'进行中':'已结束'}}</view>
+                        <!-- <view class="{{item.status == 1?'bule':'gray'}}">{{item.status == 1?'进行中':'已结束'}}</view> -->
                        <view>测评人数：{{item.personQty}}</view>
                    </view>
                </view>
@ -29,5 +36,4 @@
        <load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}"></load-more>
        <no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data>
    </scroll-view>
-
-</view>
+ </view>
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
@ -2,56 +2,15 @@ page {
    width: 100%;
    min-height: 100vh;
    overflow: hidden;
-    background-color: #f7f7f7;
+    background-color: #f0f0f0;
  }
-  .header {
-	width: 100%;
-    height: 532rpx;
-    background: linear-gradient(180deg, #7DB5FF 0%, #E8F2FF 66%, #F7F7F7 100%);
-}
-.bold{
-    font-size: 32rpx;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #333333;
-}
-.header .header-bg {
-	width: 100%;
-	height: 100%;
-	/* position: absolute;
-    z-index: 10;
-    left: 0;
-    top: 0; */
-	position: absolute;
-	height: 100%;
-	z-index: -999;
-}
-
-.header .navigation {
-	width: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 32rpx;
-	position: relative;
-	z-index: 1;
-}
-.back {
-	width: 30rpx;
-	height: 30rpx;
-	margin-left: 20rpx;
-	position: absolute;
-	margin-top: 20rpx;
-	border-radius: 0rpx;
-	z-index: 2;
-}
 .content{
    height: auto;
    width: 100%;
    overflow: hidden;
    position: relative;
-    top: -350rpx;
    padding: 0 20rpx;
+    margin-top: 20rpx;
    box-sizing: border-box;
 }
 .content .scroll {
@ -60,13 +19,13 @@ page {
 }
 .content .scroll .card{
    background-color: #fff;
-    border-radius: 20rpx;
+    border-radius:30rpx;
    box-sizing: border-box;
 }
-.content .card .bgc{
-    background:linear-gradient(531deg, #cfe5f7 0%, #E8F2FF 66%, #F7F7F7 100%);
-    border-radius: 20rpx 20rpx 0 0;
-}
+/* .content .card .bgc{
+    /* background:linear-gradient(531deg, #cfe5f7 0%, #E8F2FF 66%, #F7F7F7 100%);
+    border-radius: 20rpx 20rpx 0 0; 
+} */

 .content .card .list_card{
    display: flex;
@ -167,3 +126,107 @@ page {
    left: 50%;
    transform: translateX(-184rpx);
 }
+.list_1{
+    display: flex;
+    flex-direction: column;
+    background-color: white;
+    margin: 20rpx 15rpx 0 20rpx;
+    height: 230rpx;
+    border-radius: 30rpx;
+    padding: 20rpx 0 0 20rpx;
+   
+
+}
+.list1_1{
+    display: flex;
+    flex-direction: row;
+}
+.test_1{
+    width: 392rpx;
+    height: 33rpx;
+    overflow-wrap: break-word;
+    color: rgba(51,51,51,1);
+    font-size: 35rpx;
+    font-family: PingFang-SC-Bold;
+    font-weight: 700;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 41rpx;
+    margin: 20rpx 0 0 15rpx;
+}
+.test_2{
+    width: 68rpx;
+    height: 20rpx;
+    overflow-wrap: break-word;
+    color: rgba(153,153,153,1);
+    font-size: 26rpx;
+    font-family: PingFang-SC-Regular;
+    font-weight: normal;
+    text-align: right;
+    white-space: nowrap;
+    line-height: 42rpx;
+    margin: 20rpx 0 0 180rpx;
+}
+.list_2{
+   display: flex;
+   justify-content: center;
+   flex-direction: column; 
+   margin-top: 10rpx;
+ 
+}
+.test_3{
+    width: 220rpx;
+    height: 26rpx;
+    overflow-wrap: break-word;
+    color: rgba(102,102,102,1);
+    font-size: 30rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 46rpx;
+    margin: 20rpx 0 0 15rpx;
+    
+}
+.list_3{
+  width: 100%;
+  height: 56rpx;
+  flex-direction: row;
+  display: flex;
+  align-items: center;
+  justify-content: start;
+  margin: 40rpx 0 0 0;
+}
+.button{
+    width: 200rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    border-radius: 43rpx;
+    color: rgba(51,51,51,1);
+    font-size: 30rpx;
+    font-family:PingFang-SC-Medium;
+    margin: 20rpx 0 0 15rpx;
+    box-sizing: border-box;
+    font-weight: 500rpx;
+    height: 86rpx;
+    line-height: 86rpx;
+    background-color: rgba(57,116,246,1.000000)
+}
+.button1{
+    width: 200rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    border-radius: 43rpx;
+    color: rgba(51,51,51,1);
+    font-size: 30rpx;
+    font-family:PingFang-SC-Medium;
+    margin: 20rpx 0 0 15rpx;
+    box-sizing: border-box;
+    font-weight: 500rpx;
+    height: 86rpx;
+    line-height: 86rpx;
+}
+
+
--- a/utils/config.js
+++ b/utils/config.js
@ -6,7 +6,8 @@ module.exports = {
  
  function BASEURL() {
    // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
-    return 'http://192.168.1.144/api/' //测试环境
+    // return 'http://192.168.1.144/api/' //测试环境
+    return 'http://219.146.91.110:30801/api/'
  }