提交

995d0cee · wangyalan-git · 5ec36300 · 995d0cee · 995d0cee · 995d0cee
Commit 995d0cee authored Dec 23, 2020 by wangyalan-git
15 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,7 +12,7 @@
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/utils/config.js">
          <provider selected="true" editor-type-id="text-editor">
@@ -38,7 +38,6 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
-      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -50,12 +49,13 @@
          <select />
        </subPane>
      </pane>
+      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../yizu/easy_rent_admin" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
  </component>
@@ -84,11 +84,12 @@
      <workItem from="1603358884856" duration="655000" />
      <workItem from="1604054385788" duration="4000" />
      <workItem from="1604972001520" duration="6000" />
+      <workItem from="1605514647825" duration="86000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="665000" />
+    <option name="totallyTimeSpent" value="751000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -104,8 +105,8 @@
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Version Control" order="8" visible="true" weight="0.3937677" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.26628897" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3286119" />
      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
      <window_info anchor="bottom" id="Messages" order="11" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />

--- a/pages/basket/basket.js
+++ b/pages/basket/basket.js
@@ -72,7 +72,7 @@ Page({
      http.request(params);
      http.getCartCount();//重新计算购物车总数量
    } else {
-      app.tipGoLogin()
+      app.goLogin()
    }
  },


--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -33,6 +33,16 @@
        auto-pause-if-navigate="true"></video>
    </view>
    <!-- end swiper -->
+    <!-- 消息播放 -->
+    <view class='message-play' bindtap='onNewsPage' wx:if="{{news && news.length}}">
+      <image src='../../images/icon/horn.png' class='hornpng'></image>
+      <swiper vertical='true' autoplay='true' duration='1000' class='swiper-cont'>
+        <block wx:for='{{news}}' wx:key=''>
+          <swiper-item class="items">{{item.title}}</swiper-item>
+        </block>
+      </swiper>
+      <text class='arrow'></text>
+    </view>
  </view>
  <!-- 首发新品 -->
  <view class='more-prod'>
@@ -102,7 +112,7 @@
    </view>
  </view>
  <!-- 预热专区 -->
-  <view class='up-to-date' style="margin-top: 20rpx;" >
+  <view class='up-to-date' style="margin-top: 20rpx;">
    <view class='title'>
      <view style="display:flex;align-items: center;">
        <image src="/images/icon/hot@2x.png" class="title-icon" mode="widthFix"></image>

--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -529,4 +529,50 @@ line-height:44rpx;
  color:#333;
  display: flex;
  align-items: center;
+}
+
+/* 消息播放 */
+
+.message-play {
+  position: relative;
+  height: 90rpx;
+  background: #fff;
+  margin: auto;
+  padding: 0 60rpx 0 100rpx;
+  box-sizing: border-box;
+  box-shadow: 0 16rpx 32rpx 0 rgba(7, 17, 27, 0.05);
+  border: 2rpx solid #fafafa;
+}
+
+.message-play .hornpng {
+  width: 77rpx;
+  height: 36rpx;
+  position: absolute;
+  left: 20rpx;
+  top: 27rpx;
+  margin-right: 8rpx;
+}
+
+.message-play .swiper-cont {
+  height: 90rpx;
+  line-height: 90rpx;
+}
+
+.message-play .swiper-cont .items {
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  text-align: left;
+}
+
+.arrow {
+  width: 15rpx;
+  height: 15rpx;
+  border-top: 3rpx solid #686868;
+  border-right: 3rpx solid #686868;
+  transform: rotate(45deg);
+  position: absolute;
+  right: 30rpx;
+  top: 34rpx;
 }
\ No newline at end of file
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -60,9 +60,9 @@ Page({
    })
  },
  goBack(){
-    wx.navigateBack({
-      delta: 0,
-    })
+   wx.switchTab({
+     url: '/pages/index/index',
+   })
  },
  // 用户信息
  getUserInfo() {

--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -47,7 +47,7 @@ button {
  width: 100%;
  margin: 0 auto;
  text-align: center;
-  font-size: 28rpx;
+  font-size: 24rpx;
  color: #999;
  margin-top: 10rpx;
 }
\ No newline at end of file
--- a/pages/newDetail/index.js
+++ b/pages/newDetail/index.js
@@ -120,6 +120,12 @@ Page({
  },
  toComment() {
    var that = this, user = app.globalData.userInfo
+    if(!that.data.content){
+      wx.showToast({
+        title: '请填写内容', 
+      })
+      return
+    }
    if (user && user.userId) {
      var params = {
        url: '/consultComment/insertCommentConsult',

--- a/pages/newDetail/index.wxml
+++ b/pages/newDetail/index.wxml
@@ -3,8 +3,8 @@
  <!-- <block wx:for='{{news}}' wx:key=''> -->
  <view class='news-detail'>
    <view class='news-detail-title'>{{news.title}}</view>
-      <view class="time">{{news.createTime}}</view>
-  
+    <view class="time">{{news.createTime}}</view>
+
    <!-- <view class='news-detail-text'>{{news.content}}</view> -->
    <image wx:if="{{news.pic}}" class="img" src="{{news.pic}}" mode="widthFix"></image>
    <rich-text nodes="{{news.content}}"></rich-text>
@@ -25,8 +25,9 @@

 </view>
 <view class="bottom">
-  <input class="input" placeholder='请发表你的评论' maxlength='100' value="{{content}}"
-    bindinput="inputContent" bindconfirm="toComment" bindfocus="focusConent"></input>
+  <input class="input" placeholder='请发表你的评论' maxlength='100' value="{{content}}" bindinput="inputContent"
+     bindfocus="focusConent" bindconfirm="toComment"></input>
+  <view class="send-btn" bindtap="toComment">发送</view>
  <image class="like-img" wx:if="{{!flag}}" src="/images/icon/Fabulous@2x.png" bindtap="toLike" mode="widthFix"></image>
  <image class="like-img" wx:else src="/images/icon/Fabul@2x.png" mode="widthFix" bindtap="cancleLike"></image>
 </view>
\ No newline at end of file
--- a/pages/newDetail/index.wxss
+++ b/pages/newDetail/index.wxss
@@ -92,4 +92,11 @@
  width: 50rpx;
  height: 50rpx;
  margin-left: 20rpx;
+}
+
+.send-btn {
+  color: #39b54a;
+  font-size: 24rpx;
+  margin-left: 10rpx;
+  align-self: center;
 }
\ No newline at end of file
--- a/pages/orderList/orderList.wxml
+++ b/pages/orderList/orderList.wxml
@@ -139,9 +139,8 @@
 <view class="modal-dialog" wx:if="{{showModal}}">
  <view class="modal-title">您是否要挂单？</view>
  <view class="modal-next" style="margin-bottom: 20rpx;">
-    <text class="modal-content">
-    1、退单金额将退还到您的可提现余额中。 \n 2、订单没有满以下期限会扣相应的手续费 \n  01、2020年12月12号之前退款的将扣除本金的35%。 \n 02、2020年12月12号起订单周期 {{'<'}} 30天，扣本金 15% \n 03、2020年12月12号起订单周期 30天 {{'<'}} X {{'<'}} 60天，扣本金 12% \n 04、2020年12月12号起订单周期 60天 {{'<'}} X {{'<'}} 90天，扣本金 9% \n 05、2020年12月12号起订单周期 90 天 {{'<'}} X {{'<'}} 120天，扣本金 6% 
-  </text>
+  <text class="modal-content">
+  退单规则：\n 1、订单周期小于30天退单扣本金15%，\n 2、订单周期大于30天小于60天扣12%，\n 3、订单周期大于60天小于90天扣9%，\n 4、订单周期大于90天小于120天扣6%，大于120天不扣本金。</text>
  </view>
  <view class="modal-footer">
    <view class="btn-cancel" bindtap="onCancel" data-status="cancel">取消</view>

--- a/pages/orderWithdrawal/orderWithdrawal.wxml
+++ b/pages/orderWithdrawal/orderWithdrawal.wxml
@@ -29,7 +29,7 @@

  <view class="notice-container">
    <text class='txt-notice-title'>【温馨提醒】</text>
-    <text class="txt-notice" wx:if="{{type ==2}}">1、退单金额将退还到您的可提现余额中。 \n 2、订单没有满以下期限会扣相应的手续费 \n  01、2020年12月12号之前退款的将扣除本金的35%。 \n 02、2020年12月12号起订单周期 {{'<'}} 30天，扣本金 15% \n 03、2020年12月12号起订单周期 30天 {{'<'}} X {{'<'}} 60天，扣本金 12% \n 04、2020年12月12号起订单周期 60天 {{'<'}} X {{'<'}} 90天，扣本金 9% \n 05、2020年12月12号起订单周期 90 天 {{'<'}} X {{'<'}} 120天，扣本金 6% </text>
+    <text class="txt-notice"  wx:if="{{type ==2}}">退单规则：\n 1、订单周期小于30天退单扣本金15%，\n 2、订单周期大于30天小于60天扣12%，\n 3、订单周期大于60天小于90天扣9%，\n 4、订单周期大于90天小于120天扣6%，大于120天不扣本金。</text>
    <text class="txt-notice" wx:else>1、订单收益的提现将提现到您的可提现余额中
    </text>
  </view>

--- a/pages/prod/prod.js
+++ b/pages/prod/prod.js
@@ -72,7 +72,7 @@ Page({
      // 查看用户是否关注
      this.getCollection();
    } else {
-      app.tipGoLogin()
+      app.goLogin()
    }
  },

@@ -438,7 +438,7 @@ Page({
  addToCart: function (event) {
    let token = wx.getStorageSync('token') ? true : false
    if (!token) {
-      app.tipGoLogin()
+      app.goLogin()
      return
    }
    if (!this.data.findSku) {
@@ -476,7 +476,7 @@ Page({
  buyNow: function () {
    let token = wx.getStorageSync('token') ? true : false
    if (!token) {
-      app.tipGoLogin()
+      app.goLogin()
      return
    }
    if (!this.data.findSku) {

--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -82,7 +82,7 @@ Page({
      this.getUserAccount()
      this.getPageInfo()
    } else {
-      app.tipGoLogin()
+      app.goLogin()
    }
  },


--- a/utils/config.js
+++ b/utils/config.js
 var domain = "https://zhqg.jsonpro.cn/capi"; //统一接口域名，测试环境
-// var domain = "http://192.168.31.146:8086/capi"; //统一接口域名，测试环境
+// var domain = "http://192.168.31.122:8085/capi"; //统一接口域名，测试环境

 exports.domain = domain;
--- a/utils/http.js
+++ b/utils/http.js
@@ -53,8 +53,8 @@ function request(params, isGetTonken) {
        // if (!globalData.isLanding) {
        globalData.isLanding = true
        //重新获取token,再次请求接口
-        getApp().tipGoLogin()
-        // getApp().goLogin()
+        // getApp().tipGoLogin()
+        getApp().goLogin()
        // }
      } else if (res.statusCode == 400) {
        wx.showToast({