修改问题

新增单页
2 years ago · 147302f407
6 changed files with 295 additions and 82 deletions
--- a/pages.json
+++ b/pages.json
@ -146,6 +146,11 @@
            "style" : {
                "navigationBarTitleText" : "订单详情"
            }
+        },{
+            "path" : "pages/Pages/plan",
+            "style" : {
+                "navigationBarTitleText" : "丰行侠计划"
+            }
        }
    ],
    "globalStyle" : {
--- a/pages/Authentication/guide.vue
+++ b/pages/Authentication/guide.vue
@ -1,13 +1,44 @@
 <template>
-  <u-image :src="staticImage.fxxGuide" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
  <u-navbar
      :title="title"
      :auto-back="true"
      left-icon-size="40rpx"
      :safe-area-inset-top="true"
      :placeholder="true"
-      bgColor="transparent"
+      bgColor="#fff"
+      fixed
  ></u-navbar>
+  <u-image :src="staticImage.fxxGuide1" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="checkLogin" :src="staticImage.fxxGuide2" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image :src="staticImage.fxxGuide3" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="navTo('/pages/Line/index',true,true)" :src="staticImage.fxxGuide4" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image :src="staticImage.fxxGuide5" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="navTo('/pages/Pages/plan?scroll=#cron')" :src="staticImage.fxxGuide6" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image :src="staticImage.fxxGuide7" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="redirtTo('/pages/Index/index?footCheck=shop&tabCheck=room',true,true)" :src="staticImage.fxxGuide8" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="navTo('/pages/Service/index',true)" :src="staticImage.fxxGuide9" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="redirtTo('/pages/Index/index?footCheck=shop&tabCheck=item',true)" :src="staticImage.fxxGuide10" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="showNotDone()" :src="staticImage.fxxGuide11" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image :src="staticImage.fxxGuide12" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <uv-popup ref="notDone" round="20" :safeAreaInsetBottom="false">
+    <view class="not-done-container" style="padding:0 100rpx;">
+      <view class="not-done-icon">
+        <u-image mode="widthFix" height="400" width="400" :src="staticImage.popIcon"></u-image>
+      </view>
+      <view class="not-done-title" style="margin-bottom:74rpx;">
+        <u-text :text="notDoneContent" align="center" color="#020B18" size="28"></u-text>
+      </view>
+      <view class="not-done-btn" style="margin-bottom:60rpx;">
+        <u-button
+            text="确定"
+            color="#FF9545"
+            shape="circle"
+            custom-style="color:#020B18;font-size:36rpx;height:80rpx;max-width:320rpx;"
+            @click="this.$refs.notDone.close();"
+        ></u-button>
+      </view>
+    </view>
+  </uv-popup>
 </template>

 <script>
@ -23,6 +54,7 @@ export default {
  },
  data() {
    return {
+      notDoneContent:'暂未开启，敬请期待',
      list: [{
        name: '最新资讯'
      }, {
@ -33,47 +65,30 @@ export default {
      // 或者如下，也可以配置keyName参数修改对象键名
      // list: [{name: '未付款'}, {name: '待评价'}, {name: '已付款'}],
      current: 1,
-      title: '丰行侠行动指南',
+      title: '侠客指南',
      loading: true,
      staticImage: {
+        popIcon:imghost+ '/not-done-icon.png',
        bg: imghost + '/BG.png',
        newIcon: imghost + '/new-icon.png',
        fxxLogo: imghost + '/fxx-logo.png',
        fxxDone: imghost + '/fxx-done.png',
        fxx1: imghost + '/fxx-1.png',
        fxxGuide: imghost + '/fxx-guide.png',
-      },
-      user: {
-        avatar: imghost + '/banner.png',
-        nickname: '清晨的风',
-        coupons: 221,
-        id: 88685,
+        fxxGuide1: imghost + '/fxx-bk1.png',
+        fxxGuide2: imghost + '/fxx-bk2.png',
+        fxxGuide3: imghost + '/fxx-bk3.png',
+        fxxGuide4: imghost + '/fxx-bk4.png',
+        fxxGuide5: imghost + '/fxx-bk5.png',
+        fxxGuide6: imghost + '/fxx-bk6.png',
+        fxxGuide7: imghost + '/fxx-bk7.png',
+        fxxGuide8: imghost + '/fxx-bk8.png',
+        fxxGuide9: imghost + '/fxx-bk9.png',
+        fxxGuide10: imghost + '/fxx-bk10.png',
+        fxxGuide11: imghost + '/fxx-bk11.png',
+        fxxGuide12: imghost + '/fxx-bk12.png',
      },
      isTop: false,
-      lists: [
-        {
-          id: 1,
-          thumb: imghost + '/new-1.png',
-          title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
-          desc: '需要您带一点猫砂上门，谢谢',
-          time: '2023/06/16',
-          is_new: true
-        }, {
-          id: 2,
-          thumb: imghost + '/new-2.png',
-          title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
-          desc: '需要您带一点猫砂上门，谢谢',
-          time: '2023/06/16',
-          is_new: true
-        }, {
-          id: 3,
-          thumb: imghost + '/new-3.png',
-          title: '全市公安机关夏季治安打击整治“彭安行动”111开',
-          desc: '需要您带一点猫砂上门，谢谢',
-          time: '2023/06/16',
-          is_new: false
-        },
-      ],
      size: {
        height: 500,
      }
@ -82,49 +97,69 @@ export default {
  onLoad() {

  },
-  computed: {
-    api() {
-      return api
-    },
-    sectionStyle() {
-      const style = {};
-      style.padding = '0 26rpx';
-      style.position = 'sticky';
-      style.zIndex = '9999';
-      style.top = api.navHeight().systemBarHeight + 'px'
-      return style;
-    },
-    listHeight() {
-      let that = this;
-      let height;
-      let info = uni.createSelectorQuery().in(this).select('.subsection');
-      info.boundingClientRect(function (data) {
-        that.size.height = data.height;
-      }).exec(function (res) {
-
-      });
-      // that.size.height = (api.navHeight().windowHeight - height);
-    }
-  },
+  computed: {},
  methods: {
-    chatDetail(item) {
-      wx.navigateTo({
-        url: '/pages/ChatDetail/index?id=' + item.id
-      });
+    showNotDone(){
+      this.notDoneContent = '暂未开启，敬请期待';
+      this.$refs.notDone.open('center');
    },
-    checkSection(index) {
-      this.current = index;
+    checkLogin(){
+      if(uni.getStorageSync('user')){
+        this.notDoneContent = '您已登录,无需再次登录';
+        this.$refs.notDone.open('center');
+        // uni.showToast({'title':'您已登录,无需再次登录'})
+      }else{
+        this.navTo('/pages/Login/index');
+      }
    },
-    scrollToLower() {
+    navTo(url,token = false,fxx = false) {
+      if(token){
+        if(uni.getStorageSync('token')){
+          let user = uni.getStorageSync('user');

+          if(user.fxx.length === 0 && fxx){
+            uni.navigateTo({
+              url: '/pages/Authentication/index'
+            })
+          }else{
+            uni.navigateTo({
+              url: url
+            })
+          }
+        }else{
+          uni.navigateTo({
+            url: '/pages/Login/index'
+          })
+        }
+      }else{
+        uni.navigateTo({
+          url: url
+        })
+      }
    },
-    sexChange(e){
-      this.model1.userInfo.sex = e;
-    },
-    navTo(url) {
-      wx.navigateTo({
-        url: url
-      })
+    redirtTo(url,token = false,fxx = false) {
+      if(token){
+        if(uni.getStorageSync('token')){
+          let user = uni.getStorageSync('user');
+          if(user.fxx.length === 0 && fxx){
+            uni.navigateTo({
+              url: '/pages/Authentication/index'
+            })
+          }else {
+            uni.redirectTo({
+              url: url
+            })
+          }
+        }else{
+          uni.navigateTo({
+            url: '/pages/Login/index'
+          })
+        }
+      }else{
+        uni.redirectTo({
+          url: url
+        })
+      }
    },
  },
  onPageScroll(res) {
@ -135,7 +170,7 @@ export default {
    }
  },
  created() {
-    this.listHeight();
+    // this.listHeight();
    // this.pagePadding = (api.navHeight().navPaddingTop +
    // 	api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
  }
--- a/pages/Index/components/HomePage/index.vue
+++ b/pages/Index/components/HomePage/index.vue
@ -7,6 +7,7 @@
    <u-row :custom-style="{padding:'0 26rpx'}">
      <u-col :span="12">
        <u-swiper
+            @click="bannerClick"
            :list="indexBanner"
            height="300"
            radius="20"
@ -309,7 +310,7 @@ export default {
          disabled:false
        },
      ],
-      wallpaperBgImage: imghost+'/fxx-tip.png',
+      wallpaperBgImage: imghost+'/fxx-tip1.png',
      bg: imghost + '/BG.png',
      fiveBackground: imghost + '/five-button-background.png',
      popIcon:imghost+ '/not-done-icon.png',
@ -337,6 +338,9 @@ export default {

  },
  methods: {
+    bannerClick(){
+      this.navTo('/pages/Pages/plan');
+    },
    getNotify(){
      this.modalContent = '暂未开启,敬请期待';
      this.modalShow = true;
--- a/pages/Index/components/ShopPage/index.vue
+++ b/pages/Index/components/ShopPage/index.vue
@ -767,15 +767,11 @@ export default {
        id: 'item'
      },]
      showTabs = false;
-      for(let i = 0;i<list.length;i++){
-        if(list[i].id === 'item'){
-          current = i;
-        }
-      }
+      current = 0;
    }
    let shopMore = uni.getStorageSync('shopMore');
    if(shopMore){
-      for(let i = 0;i<this.list.length;i++){
+      for(let i = 0;i<list.length;i++){
        if(list[i].id === 'item'){
          current = i;
        }
--- a/pages/Order/detail.vue
+++ b/pages/Order/detail.vue
@ -146,6 +146,32 @@
            </template>
          </u-input>
        </u-form-item>
+        <u-form-item
+            label="合同到期时间"
+            prop="order.end_time"
+            borderBottom
+            :custom-style="{padding:'34rpx 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
+        >
+          <u-text suffix-icon="arrow-right" icon-style="font-size:32rpx;" align="left" :text="model.order.end_time || '请选择'" color="#020B18" size="32" @click="$refs.endTime.open()"></u-text>
+        </u-form-item>
+        <u-form-item
+            label="暖新币数量"
+            prop="order.number"
+            borderBottom
+            :custom-style="{padding:'34rpx 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
+        >
+          <u-input
+              inputAlign="left"
+              type="number"
+              disabledColor="#ffffff"
+              placeholder="请输入"
+              border="none"
+              :custom-style="{paddingRight:'28rpx'}"
+              v-model="model.order.number"
+              :disabled="(type !== 'create')"
+          >
+          </u-input>
+        </u-form-item>
        <u-form-item
            prop="order.payment_voucher"
            :custom-style="{padding:'0 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
@ -210,8 +236,15 @@
        @click="submit"
    ></u-button>
  </view>
-  <u-modal :show="modalShow" content="您的资料还未完善,确认前往完善?" @confirm="navTo('/pages/User/edit')" @close="navTo('/pages/Index/edit')" @cancel="navTo('/pages/Index/edit')"></u-modal>
+<!--  <u-modal :show="modalShow" content="您的资料还未完善,确认前往完善?" @confirm="navTo('/pages/User/edit')" @close="navTo('/pages/Index/edit')" @cancel="navTo('/pages/Index/edit')"></u-modal>-->
+  <uv-datetime-picker
+      :minDate="new Date().getTime()"
+      mode="date"
+      ref="endTime"
+      @confirm="endTimeSelect"
+  >

+  </uv-datetime-picker>
 </template>

 <script>
@ -244,6 +277,8 @@ export default {
          lease_agreement: '',
          bank_name:'',
          bank_card:'',
+          number:'',
+          end_time:'',
        },
      },
      rules: {
@ -290,17 +325,29 @@ export default {
          trigger: ['blur', 'change']
        },
        'order.bank_name': {
-          type: 'array',
+          type: 'string',
          required: true,
          message: '请填写开户行',
          trigger: ['blur', 'change']
        },
        'order.bank_card': {
-          type: 'array',
+          type: 'string',
          required: true,
          message: '请填写银行卡号',
          trigger: ['blur', 'change']
        },
+        'order.end_time': {
+          type: 'string',
+          required: true,
+          message: '请选择合同到期时间',
+          trigger: ['blur', 'change']
+        },
+        'order.number': {
+          type: 'number',
+          required: true,
+          message: '请填写暖新币数量',
+          trigger: ['blur', 'change']
+        },
      },
      title: '租房详情',
      loading: true,
@ -329,6 +376,9 @@ export default {
  },
  computed: {},
  methods: {
+    endTimeSelect(e){
+      this.model.order.end_time = uni.$u.timeFormat(e.value,'yyyy-mm-dd')
+    },
    getDetail(id){
      houseOrderDetail({house_order_id : id}).then(res => {
        this.model = {order: res.data};
--- a/pages/Pages/plan.vue
+++ b/pages/Pages/plan.vue
@ -0,0 +1,123 @@
+<template>
+  <u-navbar
+      :title="title"
+      :auto-back="true"
+      left-icon-size="40rpx"
+      :safe-area-inset-top="true"
+      :placeholder="true"
+      bgColor="#fff"
+      fixed
+  ></u-navbar>
+
+  <view id="why">
+    <u-image :src="staticImage.plan1" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  </view>
+  <view id="do">
+    <u-image :src="staticImage.plan2" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  </view>
+  <view id="what">
+    <u-image :src="staticImage.plan3" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  </view>
+  <view id="cron">
+    <u-image :src="staticImage.plan4" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  </view>
+  <view id="room">
+    <u-image :src="staticImage.plan5" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  </view>
+
+</template>
+
+<script>
+import {
+  imghost
+} from '@/config/host.js'
+import MzSubsection from '@/components/MzSubsection/Index.vue';
+import api from '@/utils/functions.js';
+
+export default {
+  components: {
+    MzSubsection
+  },
+  data() {
+    return {
+      current: 1,
+      title: '招募计划',
+      loading: true,
+      staticImage: {
+        bg: imghost + '/BG.png',
+        newIcon: imghost + '/new-icon.png',
+        fxxLogo: imghost + '/fxx-logo.png',
+        fxxDone: imghost + '/fxx-done.png',
+        fxx1: imghost + '/fxx-1.png',
+        plan1: imghost + '/fxx-plan1_01.png',
+        plan2: imghost + '/fxx-plan1_02.png',
+        plan3: imghost + '/fxx-plan1_03.png',
+        plan4: imghost + '/fxx-plan1_04.png',
+        plan5: imghost + '/fxx-plan1_05.png',
+      },
+      isTop: false,
+      size: {
+        height: 500,
+      }
+    }
+  },
+  onLoad(option) {
+    if(option.scroll){
+      uni.$u.sleep(500).then(()=>{
+        uni.pageScrollTo({
+          selector: option.scroll,
+          success:(res)=>{
+            console.log('res',res)
+          },
+          fail:(err) => {
+            console.log('err',err)
+          }
+        });
+      })
+    }
+  },
+  computed: {},
+  methods: {
+    checkLogin(){
+      if(uni.getStorageSync('user')){
+        uni.showToast({'title':'您已登录,无需再次登录'})
+      }else{
+        this.navTo('/pages/Login/index');
+      }
+    },
+    navTo(url,token = false) {
+      if(token){
+        if(uni.getStorageSync('token')){
+          uni.navigateTo({
+            url: url
+          })
+        }else{
+          uni.navigateTo({
+            url: '/pages/Login/index'
+          })
+        }
+      }else{
+        uni.navigateTo({
+          url: url
+        })
+      }
+    },
+  },
+  onPageScroll(res) {
+    if (res.scrollTop <= 20) {
+      uni.$emit('isTop', true);
+    } else {
+      uni.$emit('isTop', false);
+    }
+  },
+  created() {
+    // this.listHeight();
+    // this.pagePadding = (api.navHeight().navPaddingTop +
+    // 	api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
+  }
+}
+</script>
+
+<style lang="scss">
+//@import './components/done.scss';
+</style>