zhaoxiaohai 3 years ago
parent
commit
9a21309add

+ 5 - 2
components/My_LiveList/live.wxml

@@ -2,13 +2,16 @@
     <view class="list-box">
         <view class="live-item" wx:for="{{list}}" catchtap="toViewLive" data-item="{{item}}">
             <view class="img">
-                <van-image width="322rpx" height="240rpx" src="{{item.channelcoverimageurl}}" lazy-load  />
+                <van-image width="322rpx" height="240rpx" src="{{item.channelcoverimageurl}}" lazy-load fit='cover' />
                 <view class="livestatus" wx:if="{{item.livestatus=='live'}}">
                     直播中
                     <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/live.gif" />
                 </view>
                 <view wx:else class="livestatus" style="background: linear-gradient(180deg, #E6E6E6 0%, #B0B0B0 100%);justify-content: center;" >
-                    直播回放
+                    <text wx:if="{{item.livestatus=='unStart'}}">未开始</text>
+                    <text wx:elif="{{item.livestatus=='waiting'}}">直播回放</text>
+                    <text wx:elif="{{item.livestatus=='playback'}}">等待中</text>
+                    <text wx:else>已结束</text>
                 </view>
             </view>
             <view class="brand-audience">

+ 7 - 7
components/My_SupplyAndDemandList/index.wxml

@@ -5,17 +5,17 @@
         <view class="my-head-left">
             <!-- 用户信息 -->
             <view class="my-user">
-                <van-image custom-class="my-image-class" width="32rpx" height="32rpx" lazy-load src="{{item.headportraiturl||'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/userCenter/userImg.png'}}" />
+                <van-image custom-class="my-image-class" width="45rpx" height="45rpx" lazy-load src="{{item.headportraiturl||'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/userCenter/userImg.png'}}" />
                 <text class="my-name u-line-1">{{item.checkby}}</text>
-                <text style="opacity: .7;">{{item.checkdate}}</text>
+                <view style="opacity: .7; font-size: 25rpx;">{{item.checkdate}}</view>
             </view>
             <!-- 用户地址 -->
-            <view class="my-address u-line-1">
+            <view class="my-address u-line-1" style="margin-top: 8rpx;">
                 <van-icon name="location" />{{item.tposition||'暂无地址'}}
             </view>
         </view>
         <!-- 电话联系 -->
-        <van-button custom-class='my-call-up' data-phone="{{item.fphonenumber}}" data-id="{{item.tsupplyanddemandid}}" catchtap="callUp">马上拨打</van-button>
+        <van-button custom-class='my-call-up' data-phone="{{item.fphonenumber}}" data-id="{{item.tsupplyanddemandid}}" catchtap="callUp"><image src="/static/phone.png" style="height: 28rpx; margin-right: 8rpx;" mode="heightFix" />马上拨打</van-button>
     </view>
     <!-- 供需标题 -->
     <view class="my-title u-line-1">[{{item.ftype}}]{{item.ftitle}}</view>
@@ -26,9 +26,9 @@
     <!-- 供需图片九宫格 -->
     <Images attinfos='{{item.attinfos}}' ftype='{{item.ftype}}' />
     <view class="my-footer">
-        <view>浏览{{item.freadtimes}}</view>
-        <van-button custom-class='shareBut' icon="share-o" open-type="{{isLogin ? 'share':''}}" data-item="{{item}}" type="info" catchtap="shareCall">
-            分享
+        <view><image src="/static/icon-14.png" style="height: 24rpx; margin-right: 8rpx;" mode="heightFix" />浏览{{item.freadtimes}}</view>
+        <van-button custom-class='shareBut' open-type="{{isLogin ? 'share':''}}" data-item="{{item}}" type="info" catchtap="shareCall">
+            <image src="/static/share.png" style="height: 24rpx; margin-right: 8rpx;" mode="heightFix" />分享
         </van-button>
     </view>
 </navigator>

+ 16 - 7
components/My_SupplyAndDemandList/index.wxss

@@ -2,13 +2,14 @@
     width: 100vw;
     background-color: #ffffff;
     margin-bottom: 20px;
-    padding: 30rpx 24rpx 20rpx;
+    padding: 20rpx 24rpx 20rpx;
     box-sizing: border-box;
 }
 
 .my-head {
     display: flex;
     justify-content: space-between;
+    align-items: center;
     height: 76rpx;
     width: 100%;
     margin-bottom: 8rpx;
@@ -20,24 +21,29 @@
 }
 
 .my-user {
-    height: 32rpx;
-    line-height: 32rpx;
+    position: relative;
+    height: 60rpx;
+    line-height: 30rpx;
     font-size: 28rpx;
     color: #333333;
+    padding-left: 55rpx;
+    box-sizing: border-box;
 }
 
 .my-user .my-name {
     display: inline-block;
-    max-width: 284rpx;
-    margin-left: 8rpx;
+    width: 400rpx;
     margin-right: 10rpx;
     vertical-align: top;
 }
 
 .my-user .my-image-class {
-    vertical-align: top;
+    position: absolute;
     border-radius: 50%;
     overflow: hidden;
+    left: 0rpx;
+    top: 50%;
+    margin-top: -26rpx;
 }
 
 /* 地址 */
@@ -53,6 +59,8 @@
 
 /* 电话联系按钮 */
 .my-call-up {
+    display: flex;
+    align-items: center !important;
     width: 196rpx;
     height: 52rpx;
     background: linear-gradient(180deg, #FFDC00 0%, #FFB600 100%);
@@ -61,6 +69,7 @@
     font-size: 28rpx;
     font-family: PingFangSC-Medium, PingFang SC;
     color: #FFFFFF;
+    padding: 0 !important;
 }
 
 /* 供需标题 */
@@ -70,7 +79,7 @@
     font-family: PingFangSC-Regular, PingFang SC;
     color: #000000;
     line-height: 44rpx;
-    margin-top: 20rpx;
+    margin-top: 30rpx;
 }
 
 /* 供需说明 */

+ 6 - 7
pages/login/index.wxml

@@ -1,21 +1,20 @@
 <!-- LOGO -->
-<view class="login_logo">
-    <image src="../../static/logo.png" mode="aspectFill"></image>
-</view>
+<image class="login_logo" src="../../static/logo.png" mode="aspectFill" />
+
 <!-- 手机登录 -->
 <block wx:if="{{pageType=='login'}}">
     <My_RectangularFrame title="手机登录">
         <view class="form_box">
             <!-- 手机号 -->
             <view class="input_text_box">
-                <image class="input_text_img" src="../../static/login/Phone.png" mode="aspectFill"></image>
+                <image class="input_text_img" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/login/Phone.png" mode="aspectFill" />
                 <view class="input_text_input">
                     <van-field model:value="{{ fphonenumber }}" data-name="fphonenumber" bind:focus='inputFocus' bindblur='inputBlur' error="{{errTips.fphonenumber}}" type="number" input-class="input-class" placeholder="请输入手机号" border="{{ false }}" />
                 </view>
             </view>
             <!-- 验证码 -->
             <view class="input_text_box">
-                <image class="input_text_img" src="../../static/login/verificationcode.png" mode="aspectFill"></image>
+                <image class="input_text_img" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/login/verificationcode.png" mode="aspectFill" />
                 <view class="input_text_input" style="width: 250rpx; background-color: brown;">
                     <van-field model:value="{{ password }}" data-name="password" bind:focus='inputFocus' type="number" input-class="input-class" error="{{errTips.password}}" placeholder="请输入验证码" border="{{ false }}" />
                 </view>
@@ -36,14 +35,14 @@
         <view class="form_box">
             <!-- 商户名 -->
             <view class="input_text_box">
-                <image class="input_text_img" src="../../static/login/username.png" mode="aspectFit"></image>
+                <image class="input_text_img" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/login/username.png" mode="aspectFit" />
                 <view class="input_text_input">
                     <van-field value="{{ fname }}" data-name="fname" bind:input='eliminate' input-class="input-class" placeholder="请输入账号名" border="{{ false }}" />
                 </view>
             </view>
             <!-- 身份 -->
             <view class="input_text_box">
-                <image class="input_text_img" src="../../static/login/identity.png" mode="aspectFill"></image>
+                <image class="input_text_img" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/login/identity.png" mode="aspectFill" />
                 <view class="input_text_input">
                     <van-field value="{{ frole }}" data-name="frole" bind:input='eliminate' input-class="input-class" placeholder="请填写身份/职位" border="{{ false }}" />
                 </view>

+ 3 - 7
pages/login/index.wxss

@@ -19,16 +19,12 @@
 
 /* logo */
 .login_logo {
-    width: 186rpx;
-    height: 160rpx;
+    display: block;
+    width: 186rpx !important;
+    height: 160rpx !important;
     margin: 60rpx auto 0;
 }
 
-.login_logo>image {
-    width: 100%;
-    height: 100%;
-}
-
 /* 按钮 */
 .input_text_but {
     width: 340rpx;

+ 1 - 1
pages/portal/index.js

@@ -12,7 +12,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        wx.redirectTo({
+        wx.switchTab({
           url: '/pages/tabbar-pages/home/index',
         })
     },

+ 4 - 0
pages/portal/index.json

@@ -0,0 +1,4 @@
+{
+    "navigationStyle": "custom",
+    "usingComponents": {}
+}

+ 3 - 2
pages/tabbar-pages/home/analysis/UserMsg/index.wxml

@@ -10,6 +10,7 @@
         <view class="time">{{item.createdate}}</view>
     </view>
 </view>
-<view wx:if="{{item&&list.length==10}}" class="even-more" bindtap="viewMore">
-    更多浏览>>
+<view class="even-more" wx:if="{{item&&list.length==10}}" bindtap="viewMore">
+    更多浏览
+    <image style="width: 22rpx; height: 24rpx; margin-left: 8rpx;" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/analysis/more.png" />
 </view>

+ 0 - 1
pages/tabbar-pages/home/analysis/UserMsg/index.wxss

@@ -22,7 +22,6 @@
 
 .even-more {
     height: 40rpx;
-    font-size: 28rpx;
     color: #00C1D2;
     line-height: 40rpx;
     margin: 0 auto;

+ 3 - 1
pages/tabbar-pages/home/analysis/detalis.wxml

@@ -5,7 +5,9 @@
             <text class="name u-line-1">{{detalis.checkby}}</text>
             <text class="time">{{detalis.checkdate}}</text>
         </view>
-        <van-button icon='share-o' custom-class='share-but' catchtap="startDraw">分享</van-button>
+        <van-button custom-class='share-but' catchtap="startDraw">
+            <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/analysis/share.png" style="width: 28rpx; vertical-align: middle; margin-bottom: 8rpx;" mode="widthFix" />
+        分享</van-button>
     </view>
     <view class="title">[{{detalis.ftype}}]{{detalis.ftitle}}</view>
 </view>

+ 7 - 3
pages/tabbar-pages/home/analysis/index.js

@@ -38,16 +38,20 @@ Page({
             if (res.msg != '成功') return wx.showToast({
                 title: res.data
             })
+            let url = 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/analysis/'
             this.setData({
                 statistics: [{
                     title: '分享总数',
-                    number: res.data.fsharetimes
+                    number: res.data.fsharetimes,
+                    backImage: `${url}bg-01.png`
                 }, {
                     title: '电话总数',
-                    number: res.data.fphonetimes
+                    number: res.data.fphonetimes,
+                    backImage: `${url}bg-02.png`
                 }, {
                     title: '浏览总数',
-                    number: res.data.freadtimes
+                    number: res.data.freadtimes,
+                    backImage: `${url}bg-03.png`
                 }]
             })
         });

+ 5 - 2
pages/tabbar-pages/home/analysis/index.wxml

@@ -1,7 +1,7 @@
 <!-- 数据展示 -->
 <view class="display">
     <view class="content">
-        <view class="rectangle" wx:for="{{statistics}}" wx:key="index">
+        <view class="rectangle" style="background: url({{item.backImage}}) no-repeat; background-size:100%;" wx:for="{{statistics}}" wx:key="index">
             <view class="nub u-line-1">{{item.number}}</view>
             <view class="name u-line-1">{{item.title}}</view>
         </view>
@@ -22,7 +22,10 @@
                 <text class="name u-line-1">{{item.checkby}}</text>
                 <text class="time">{{item.checkdate}}</text>
             </view>
-            <van-button icon='share-o' custom-class='share-but' data-item="{{item}}" catchtap="startDraw">分享</van-button>
+            <van-button custom-class='share-but' data-item="{{item}}" catchtap="startDraw">
+                <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/analysis/share.png" style="width: 28rpx; vertical-align: middle; margin-bottom: 5rpx;" mode="widthFix" />
+                分享
+            </van-button>
         </view>
         <view class="title">[{{item.ftype}}]{{item.ftitle}}</view>
     </view>

+ 13 - 2
pages/tabbar-pages/home/analysis/shareBox/index.js

@@ -28,7 +28,7 @@ Component({
                 imgDraw: {
                     width: '750rpx',
                     height: '982rpx',
-                    background: '', //背景图片
+                    background: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/share/shareImage.png', //背景图片
                     views: [
                         /* 顶部蓝色背景 */
                         {
@@ -45,7 +45,7 @@ Component({
                         /* Logo */
                         {
                             type: 'image',
-                            url: '/static/tacitly-approve/MRuserImg.png',
+                            url: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/tacitly-approve/MRuserImg.png',
                             css: {
                                 top: '64rpx',
                                 left: '50rpx',
@@ -358,6 +358,17 @@ Component({
                                 fontWeight: '600'
                             }
                         },
+                        /* 箭头 */
+                        {
+                            type: 'image',
+                            url: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/share/right.png',
+                            css: {
+                                top: '842rpx',
+                                left: '408rpx',
+                                width: '52rpx',
+                                height: '36rpx',
+                            }
+                        },
                         /* 用户头像 */
                         {
                             type: 'image',

+ 1 - 1
pages/tabbar-pages/home/index.wxml

@@ -26,5 +26,5 @@
 </view>
 <!-- 贴边按钮 -->
 <navigator class="welt" url='#' bindtap="toRelease">
-
+    <image src="/static/flyLetter.png" style="height: 34rpx; margin-right: 10rpx; margin-left: 26rpx;" mode="heightFix" />发布
 </navigator>

+ 6 - 1
pages/tabbar-pages/home/index.wxss

@@ -22,10 +22,12 @@
     margin-left: 12rpx;
 }
 
- 
+
 /* 贴边按钮 */
 .welt {
     position: fixed;
+    display: flex;
+    align-items: center;
     width: 168rpx;
     height: 82rpx;
     background: #00C1D2;
@@ -33,4 +35,7 @@
     border-radius: 41rpx 0px 0px 41rpx;
     top: 65%;
     right: 0;
+    font-size: 36rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    color: #FFFFFF;
 }

+ 2 - 0
pages/tabbar-pages/home/sdDetalis.wxml

@@ -26,7 +26,9 @@
 <!-- 供需数据与操作 -->
 <view class="footer">
     <view>
+        <image src="/static/icon-14.png" style="height: 28rpx; margin-right: 8rpx;" mode="heightFix" />
         <text style="margin-right: 30rpx;">浏览数{{detalis.freadtimes}}</text>
+        <image src="/static/share.png" style="height: 28rpx; margin-right: 8rpx;" mode="heightFix" />
         <text>分享数{{detalis.fsharetimes}}</text>
     </view>
     <van-button round color="#F6F7F8" wx:if="{{ism}}" catchtap="deleteItem" custom-class='deleteBut'>删除</van-button>

+ 2 - 0
pages/tabbar-pages/home/sdDetalis.wxss

@@ -82,6 +82,8 @@
     color: rgba(51, 51, 51, 0.7);
 }
 .footer>view{
+    display: flex;
+    align-items: center;
     height: 52rpx;
     line-height: 52rpx;
 }

+ 2 - 1
pages/tabbar-pages/liveBroadcast/index.wxml

@@ -4,10 +4,11 @@
 <van-search value="{{ value }}" shape="round" background="#F6F7F8" bind:search='onSearch' bind:clear='onClear' placeholder="请输入搜索关键词" />
 <!-- 直播列表 -->
 <LiveList list='{{tiveList}}' />
-
+<van-empty wx:if="{{tiveList.length==0}}" description="暂无内容" />
 <!-- 占位 -->
 <view style="height: 90rpx; width: 50rpx;" />
 
 <!-- 贴边 -->
 <navigator url="/pages/liveStreaming/index" class="welt">
+    <image src="/static/play.png" style="height: 36rpx; margin:0 10rpx 0 26rpx;" mode="heightFix" />我要直播
 </navigator>

+ 5 - 0
pages/tabbar-pages/liveBroadcast/index.wxss

@@ -4,6 +4,8 @@
 }
 
 .welt {
+    display: flex;
+    align-items: center;
     position: fixed;
     right: 0;
     top: 65%;
@@ -12,6 +14,9 @@
     background: #00C1D2;
     box-shadow: 0px 6rpx 6rpx 0px rgba(0, 0, 0, 0.1);
     border-radius: 41rpx 0px 0px 41rpx;
+    font-size: 36rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    color: #FFFFFF;
 }
 
 /* 搜索框 */

+ 1 - 1
pages/tabbar-pages/user/index.js

@@ -28,7 +28,7 @@ Page({
         }, {
             id: '005',
             text: '我的需求',
-            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/userCenter/icon-01.png'
+            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/userCenter/icon-05.png'
         }],
         userMessage: {}, //用户信息
         myShowModel: false, //显示弹出窗

+ 7 - 0
project.private.config.json

@@ -58,6 +58,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "登录",
+                    "pathName": "pages/login/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }

BIN
static/flyLetter.png


BIN
static/login/Phone.png


BIN
static/login/identity.png


BIN
static/login/username.png


BIN
static/login/verificationcode.png


BIN
static/phone.png


BIN
static/play.png


BIN
static/share.png


+ 2 - 2
utils/Http.js

@@ -1,5 +1,5 @@
-const baseUrl = "https://test.buwanjia.com/bwj/rest/webclientrest";
-// const baseUrl = "https://www.buwanjia.com/bwj/rest/webclientrest";
+// const baseUrl = "https://test.buwanjia.com/bwj/rest/webclientrest";
+const baseUrl = "https://www.buwanjia.com/bwj/rest/webclientrest";
 class HTTP {
     request({
         url,