天府星

src/project/tianfuxing/AppHome/Activity.vue

@@ -225,7 +225,7 @@ import { mapActions, mapState } from 'vuex'
           scope: 'scope.userLocation',
           success: () => {
             uni.getLocation({
-              type: 'wgs84',
+              type: 'gcj02',
               success: res => {
                 this.latitude = res.latitude
                 this.longitude = res.longitude

src/project/tianfuxing/AppMy/AddDiscounts.vue

@@ -0,0 +1,62 @@
+<template>
+  <div class="AddDiscounts">
+    <div class="form">
+      <input placeholder="输入优惠内容标题" placeholder-style="color: #AAAAAA; font-size: 15px;" />
+      <textarea placeholder="输入优惠内容详情" 	placeholder-class="input-placeholder" placeholder-style="color: #AAAAAA; font-size: 15px;" />
+    </div>
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="save">发布</div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    appName: '发布优惠',
+    name: 'AddDiscounts',
+
+    data () {
+      return {
+
+      }
+    },
+
+    onLoad () {
+
+    },
+
+    methods: {
+
+    }
+  }
+</script>
+
+<style lang="scss">
+  .AddDiscounts {
+    margin: 0 32px;
+    padding-top: 32px;
+    padding-bottom: 140px;
+
+    .form {
+      padding: 0 32px;
+      background: #FFFFFF;
+      border-radius: 32px;
+      box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+
+      input {
+        display: block;
+        height: 128px;
+        font-size: 30px;
+        border-bottom: 1px solid #eee;
+      }
+
+      textarea {
+        display: block;
+        width: 100%;
+        height: 480px;
+        padding: 48px 0;
+        font-size: 30px;
+      }
+    }
+  }
+</style>

src/project/tianfuxing/AppMy/AppMy.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="my">
-    <div class="user" @click="toSetting">
+    <div class="user">
       <image :src="user.avatarUrl || 'https://cdn.cunwuyun.cn/wxmp/tianfuxing/avatar.png'" />
       <div class="right" v-if="isLogin">
         <h2>{{ user.nickName }}</h2>
@@ -23,21 +23,18 @@
         <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/nav1.png" />
       </div>
     </div>
-    <div class="my-list">
+    <div class="my-group">
-      <h2>积分明细</h2>
+      <div class="group-item" hover-class="bg-hover" @click="linkTo('./UserInfo')">
-      <div class="list">
+        <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/banshijindu@2x.png" />
-        <div class="item" v-for="(item, index) in list" :key="index">
+        <span>个人中心</span>
-          <div class="left">
-            <h2>{{ item.detail }}</h2>
-            <p>{{ item.createTime }}</p>
       </div>
-          <div class="right">
+      <div class="group-item" hover-class="bg-hover" @click="linkTo('./Merchants')">
-            <i>{{ item.calcType === '0' ? '-' : '+' }}</i>
+        <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/chaoshidingdan@2x.png" />
-            <span>{{ item.integral || 0 }}</span>
+        <span>商户中心</span>
-            <em>积分</em>
       </div>
-        </div>
+      <div class="group-item" hover-class="bg-hover" @click="linkTo('./Integral')">
-        <AiEmpty v-if="!list.length"></AiEmpty>
+        <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/wodejifen@2x.png" />
+        <span>积分明细</span>
       </div>
     </div>
   </div>
@@ -68,7 +65,6 @@
     onLoad () {
       if (this.token) {
         this.getUserInfo()
-        this.getList()
       } else {
         this.autoLogin()
       }
@@ -78,23 +74,14 @@
       })
     },
 
-    onShow () {
-      this.isMore = false
-      this.current = 1
-
-      this.$nextTick(() => {
-        this.getList()
-      })
-    },
-
     methods: {
       ...mapActions(['autoLogin', 'getUserInfo']),
 
-      toSetting () {
+      linkTo (url) {
         if (!this.token) {
           this.autoLogin()
         } else {
-          this.$linkTo('./UserInfo')
+          this.$linkTo(url)
         }
       },
 
@@ -107,44 +94,7 @@
         } else {
           this.getUserInfo()
         }
-      },
-
-      getList () {
-        if (this.isMore) return
-
-        this.$instance.post(`/api/appwechatintegraldetail/list`, null, {
-          params: {
-            current: this.current,
-            size: 10,
-            openId: this.user.openId
       }
-        }).then(res => {
-          if (res.code === 0) {
-            this.$hideLoading()
-            if (this.current > 1) {
-              this.list = [...this.list, ...res.data.records]
-            } else {
-              this.list = res.data.records
-            }
-
-            if (res.data.records.length < 10) {
-              this.isMore = true
-
-              return false
-            }
-
-            this.current = this.current + 1
-          } else {
-            this.isMore = true
-          }
-        }).catch(() => {
-          this.$hideLoading()
-        })
-      }
-    },
-
-    onReachBottom () {
-      this.getList()
     }
   }
 </script>
@@ -158,6 +108,32 @@
       box-sizing: border-box;
     }
 
+    .my-group {
+      margin: 0 32px;
+
+      .group-item {
+        display: flex;
+        align-items: center;
+        height: 100px;
+        margin-bottom: 24px;
+        padding: 0 16px;
+        box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+        border-radius: 16px;
+        background: #fff;
+
+        image {
+          width: 48px;
+          height: 48px;
+          margin-right: 18px;
+        }
+
+        span {
+          color: #666666;
+          font-size: 30px;
+        }
+      }
+    }
+
     .user, .info {
       display: flex;
       align-items: center;
@@ -189,66 +165,6 @@
       }
     }
 
-    .my-list {
-      padding: 0 32px;
-
-      & > h2 {
-        margin-bottom: 42px;
-        font-weight: 600;
-        font-size: 34px;
-        color: #333333;
-      }
-
-      .item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-bottom: 24px;
-        padding: 24px;
-        background: #FFFFFF;
-        box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
-        border-radius: 16px;
-
-        .right {
-          display: flex;
-          align-items: baseline;
-          line-height: 1;
-
-          i {
-            color: #FFB94C;
-            font-size: 32px;
-          }
-
-          span {
-            color: #FFB94C;
-            font-size: 40px;
-          }
-
-          em {
-            font-size: 26px;
-            color: #999999;
-          }
-        }
-
-        .left {
-          flex: 1;
-          margin-right: 20px;
-
-          h2 {
-            line-height: 1.3;
-            margin-bottom: 10px;
-            font-size: 34px;
-            color: #333333;
-          }
-
-          p {
-            font-size: 26px;
-            color: #999999;
-          }
-        }
-      }
-    }
-
     .info {
       display: flex;
       align-items: center;

src/project/tianfuxing/AppMy/Integral.vue

@@ -0,0 +1,157 @@
+<template>
+  <div class="my" v-if="pageShow">
+    <div class="my-list">
+      <div class="list">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <div class="left">
+            <h2>{{ item.detail }}</h2>
+            <p>{{ item.createTime }}</p>
+          </div>
+          <div class="right">
+            <i>{{ item.calcType === '0' ? '-' : '+' }}</i>
+            <span>{{ item.integral || 0 }}</span>
+            <em>积分</em>
+          </div>
+        </div>
+        <AiEmpty v-if="!list.length"></AiEmpty>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    appName: '积分明细',
+    name: 'Integral',
+
+    data () {
+      return {
+        list: [],
+        current: 1,
+        pageShow: false,
+        isMore: false
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    onLoad () {
+      this.$loading()
+      this.getList()
+    },
+
+    methods: {
+      getList () {
+        if (this.isMore) return
+
+        this.$instance.post(`/api/appwechatintegraldetail/list`, null, {
+          params: {
+            current: this.current,
+            size: 10,
+            openId: this.user.openId
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.$hideLoading()
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records]
+            } else {
+              this.list = res.data.records
+            }
+
+            this.pageShow = true
+
+            if (res.data.records.length < 10) {
+              this.isMore = true
+
+              return false
+            }
+
+            this.current = this.current + 1
+          } else {
+            this.isMore = true
+          }
+        }).catch(() => {
+          this.$hideLoading()
+        })
+      }
+    },
+
+    onReachBottom () {
+      this.getList()
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .my {
+    padding-top: 32px;
+    padding-bottom: 30px;
+
+    div {
+      box-sizing: border-box;
+    }
+    .my-list {
+      padding: 0 32px;
+
+      & > h2 {
+        margin-bottom: 42px;
+        font-weight: 600;
+        font-size: 34px;
+        color: #333333;
+      }
+
+      .item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 24px;
+        padding: 24px;
+        background: #FFFFFF;
+        box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+        border-radius: 16px;
+
+        .right {
+          display: flex;
+          align-items: baseline;
+          line-height: 1;
+
+          i {
+            color: #FFB94C;
+            font-size: 32px;
+          }
+
+          span {
+            color: #FFB94C;
+            font-size: 40px;
+          }
+
+          em {
+            font-size: 26px;
+            color: #999999;
+          }
+        }
+
+        .left {
+          flex: 1;
+          margin-right: 20px;
+
+          h2 {
+            line-height: 1.3;
+            margin-bottom: 10px;
+            font-size: 34px;
+            color: #333333;
+          }
+
+          p {
+            font-size: 26px;
+            color: #999999;
+          }
+        }
+      }
+    }
+  }
+</style>

src/project/tianfuxing/AppMy/Merchants.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="merchants">
+    <div class="top">
+      <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/avatar.png" />
+      <div class="right">
+        <h2>商户名称名称名称</h2>
+        <p>成都市金牛区xxxx大厦成都成都成都成都市金牛区xxxx大厦成都成都成都成…</p>
+      </div>
+    </div>
+    <div class="merchants-wrapper">
+      <h2>我发布的优惠</h2>
+      <div class="merchants-list">
+        <div class="item">
+          <div class="item-top">
+            <h2>Lv.1会员进店享受9折优惠</h2>
+            <p>百年征程波澜壮阔，百年初心历久弥坚。7月1日上午，庆祝中国共产党成立100周年大会在北京天安门广场隆重举行，各界代表7万余人以盛…百年征程波澜壮阔，百年初心历久弥坚。7月1日上午，庆祝中国共产党成立100周年大会在北京天安门广场隆重举行，各界代表7万余人以盛…</p>
+            <div class="item-tags">
+              <span>审核通过</span>
+            </div>
+          </div>
+          <div class="item-bottom">
+            <div hover-class="bg-hover">修改</div>
+            <div hover-class="bg-hover">删除</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="$linkTo('./AddDiscounts')">发布优惠信息</div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    appName: '商户中心',
+    name: 'Merchants',
+
+    data () {
+      return {
+
+      }
+    },
+
+    onLoad () {
+
+    },
+
+    methods: {
+
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .merchants {
+    margin: 0 32px;
+    padding-top: 32px;
+    padding-bottom: 140px;
+
+    .merchants-wrapper {
+      margin-top: 58px;
+
+      & > h2 {
+        margin-bottom: 46px;
+        font-weight: 600;
+        font-size: 34px;
+        color: #1D2229;
+      }
+
+      .item {
+        margin-bottom: 24px;
+        background: #FCFCFC;
+        box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+        border-radius: 16px;
+
+        .item-top {
+          padding: 24px;
+
+          h2 {
+            margin-bottom: 12px;
+            font-size: 34px;
+            color: #333333;
+          }
+
+          p {
+            line-height: 1.3;
+            font-size: 30px;
+            color: #999999;
+            display: -webkit-box;
+            -webkit-line-clamp: 3;
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+          }
+
+          .item-tags {
+            display: flex;
+            align-items: center;
+            margin-top: 24px;
+
+            span {
+              height: 48px;
+              line-height: 48px;
+              padding: 0 16px;
+              color: #3BBC37;
+              font-size: 26px;
+              background: #F5FCF5;
+              border: 1px solid #E2F6E1;
+              border-radius: 8px;
+
+              &.status-2 {
+                color: #E23C3C;
+                background: #E23C3C;
+                border: 1px solid #FAE2E2;
+              }
+
+              &.status-0 {
+                color: #FF883C;
+                background: #FFF9F5;
+                border: 1px solid #FFEDE2;
+              }
+            }
+          }
+        }
+
+        .item-bottom {
+          display: flex;
+          align-items: center;
+          height: 88px;
+          border-top: 1px solid #EEEEEE;
+
+          div {
+            flex: 1;
+            height: 100%;
+            line-height: 88px;
+            text-align: center;
+            font-size: 28px;
+            color: #687DA6;
+          }
+        }
+      }
+    }
+
+    .top {
+      display: flex;
+      align-items: center;
+      padding: 24px;
+      background: #FFFFFF;
+      box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+      border-radius: 16px;
+
+      image {
+        width: 112px;
+        height: 112px;
+        margin-right: 24px;
+      }
+
+      .right {
+        flex: 1;
+      }
+
+      h2 {
+        margin-bottom: 14px;
+        font-weight: 600;
+        font-size: 34px;
+        color: #333333;
+      }
+
+      p {
+        line-height: 1.3;
+        font-size: 26px;
+        color: #999999;
+      }
+    }
+  }
+</style>

src/project/tianfuxing/AppMy/UserInfo.vue

@@ -22,10 +22,22 @@
             <input placeholder="请输入手机号" type="number" maxlength="11" v-model="userInfo.phone" />
           </div>
         </div>
+        <div class="form-item">
+          <h2>所在社区</h2>
+          <div class="form-item__right">
+            <input placeholder="请输入所在社区" v-model="userInfo.nickName" />
+          </div>
+        </div>
+        <div class="form-item">
+          <h2>所在小区</h2>
+          <div class="form-item__right">
+            <input placeholder="请输入所在小区" v-model="userInfo.phone" />
+          </div>
+        </div>
       </div>
     </div>
     <div class="btn-wrapper">
-      <div class="btn" hover-class="text-hover" @click="save">保存</div>
+      <div class="btn" hover-class="text-hover" @click="save">提交</div>
     </div>
   </div>
 </template>