guhongwei 4 năm trước cách đây
mục cha
commit
f69408fe20

+ 1 - 1
app.js

@@ -35,7 +35,7 @@ App({
   },
   globalData: {
     userInfo: null,
-    serverUrl:'http://broadcast.waityou24.cn'
+    publicUrl: 'http://broadcast.waityou24.cn'
   },
   id: 'wx2c50f82dae28a9f5'
 })

+ 1 - 1
app.json

@@ -56,7 +56,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "鸿泰跃达",
+    "navigationBarTitleText": "鸿泰悦达网络互联科技有限公司",
     "navigationBarTextStyle": "black"
   },
   "sitemapLocation": "sitemap.json"

+ 0 - 10
pages/card/card.js

@@ -25,12 +25,6 @@ Page({
       { name: '169套餐' },
       { name: '129套餐' },
     ],
-    // 类型列表
-    typeList: [
-      { name: '余额' },
-      { name: '花呗' },
-      { name: '微信' },
-    ],
   },
   // 选择省份
   provinceChange: function (e) {
@@ -44,10 +38,6 @@ Page({
   mealChange: function (e) {
     this.setData({ "form.meal": this.data.mealList[e.detail.value].name })
   },
-  // 选择类型
-  typeChange: function (e) {
-    this.setData({ "form.type": this.data.typeList[e.detail.value].name })
-  },
   //事件处理函数
   formSubmit: function (e) {
     console.log(e.detail.value);

+ 3 - 11
pages/card/card.wxml

@@ -1,6 +1,6 @@
 <view class="main">
   <view class="one">
-    我要办卡
+    我要注册
   </view>
   <view class="two">
     <form bindsubmit="formSubmit" bindreset="formReset">
@@ -37,14 +37,6 @@
           </view>
         </picker>
       </view>
-      <view class="formData">
-        <text class="label">类型</text>
-        <picker class="createTime" bindchange="typeChange" name="type" value="{{form.type}}" range="{{typeList}}"
-          range-key="{{'name'}}">
-          <view class="picker">{{form.type||'选择类型'}}
-          </view>
-        </picker>
-      </view>
       <view class="forminput">
         <text class="label">姓名</text>
         <input type='text' name="name" value="{{form.name}}" placeholder='姓名'></input>
@@ -54,8 +46,8 @@
         <input type='number' name="card" value="{{form.card}}" maxlength="18" placeholder='身份证号'></input>
       </view>
       <view class="forminput">
-        <text class="label">支付宝账号</text>
-        <input type='text' name="zfb" value="{{form.zfb}}" placeholder='支付宝账号'></input>
+        <text class="label">微信账号</text>
+        <input type='text' name="zfb" value="{{form.zfb}}" placeholder='微信账号'></input>
       </view>
       <view class="forminput">
         <text class="label">推荐人</text>

+ 17 - 6
pages/exchange/exchange.js

@@ -5,10 +5,9 @@ const app = getApp()
 Page({
   data: {
     form: {
-      type: '支付宝',
       name: '顾红伟',
       phone: '17319450324',
-      isNum: '100.00',
+      isNum: '100',
     },
     number: ''
   },
@@ -18,12 +17,24 @@ Page({
     data.number = e.detail.value.number;
     // 判断提现金额是否大于已拥有的金额
     if (parseFloat(data.number) <= parseFloat(data.isNum)) {
-      // 扣除6%手续费
-      data.number = (data.number - data.number * 0.06).toFixed(2);
-      console.log(data);
+      if (parseFloat(data.isNum) >= 100 && parseFloat(data.number) >= 100) {
+        // 扣除6%手续费
+        data.number = (data.number - data.number * 0.06).toFixed(2);
+        wx.showToast({
+          title: '提现成功',
+          icon: 'success',
+          duration: 2000
+        })
+      } else {
+        wx.showToast({
+          title: '提现积分最低为100,请输入大于100的积分',
+          icon: 'none',
+          duration: 2000
+        })
+      }
     } else {
       wx.showToast({
-        title: '输入错误,请重新输入',
+        title: '当前输入积分大于您目前拥有积分,请重新输入',
         icon: 'none',
         duration: 2000
       })

+ 1 - 1
pages/exchange/exchange.wxml

@@ -6,7 +6,7 @@
     <form bindsubmit="formSubmit" bindreset="formReset">
       <view class="twoType">
         <text>兑换账号</text>
-        <text>{{form.type}}</text>
+        <text>微信</text>
       </view>
       <view class="twoUser">
         <text>{{form.name}}</text>

+ 20 - 0
pages/home/home.js

@@ -113,5 +113,25 @@ Page({
   },
 
   onLoad: function () {
+    wx.request({
+      url: app.globalData.publicUrl + '/api/market/product/newquery',
+      method: "get",
+      data: { skip: 0, limit: 10 },
+      success: (res) => {
+        if (res.data.errcode == '0') {
+          wx.showToast({
+            title: '搜索成功',
+            icon: 'success',
+            duration: 2000
+          })
+        } else {
+          wx.showToast({
+            title: '查询失败',
+            icon: 'error',
+            duration: 2000
+          })
+        }
+      }
+    })
   },
 })

+ 6 - 6
pages/home/home.wxml

@@ -19,7 +19,7 @@
       </view>
       <view class="btn" bindtap="settingBtn">
         <image src="/pages/images/sz.png"></image>
-        <text>设置账号</text>
+        <text>推荐码</text>
       </view>
       <view class="btn" bindtap="editpwdBtn">
         <image src="/pages/images/xg.png"></image>
@@ -66,13 +66,13 @@
         <image src="/pages/images/about.png"></image>
         <text>关于我们</text>
       </view>
-      <view class="num" bindtap="newsBtn">
+      <!-- <view class="num" bindtap="newsBtn">
         <image src="/pages/images/news.png"></image>
         <text>通知新闻</text>
-      </view>
+      </view> -->
       <view class="num" bindtap="cardBtn">
         <image src="/pages/images/ka.png"></image>
-        <text>我要办卡</text>
+        <text>我要注册</text>
       </view>
       <view class="num" bindtap="teamBtn">
         <image src="/pages/images/team2.png"></image>
@@ -94,10 +94,10 @@
         <image src="/pages/images/gd.png"></image>
         <text>股东奖池</text>
       </view>
-      <view class="num" bindtap="userBtn">
+      <!-- <view class="num" bindtap="userBtn">
         <image src="/pages/images/user.png"></image>
         <text>用户列表</text>
-      </view>
+      </view> -->
     </van-col>
   </van-row>
 </view>

BIN
pages/images/sz.png


+ 2 - 12
pages/setting/setting.js

@@ -3,18 +3,8 @@
 const app = getApp()
 
 Page({
-  data: {
-    form: {}
-  },
-  //事件处理函数
-  formSubmit: function (e) {
-    let data = e.detail.value;
-    console.log(data);
-  },
+  data: {},
+
   onLoad: function () {
-    var phone = 'form.phone'
-    this.setData({
-      [phone]: '17319450324'
-    })
   },
 })

+ 1 - 17
pages/setting/setting.wxml

@@ -3,22 +3,6 @@
     设置账号
   </view>
   <view class="two">
-    <form bindsubmit="formSubmit" bindreset="formReset">
-      <view class="content">
-        <text>手机号</text>
-        <input type='number' name="phone" value="{{form.phone}}" placeholder='手机号'></input>
-      </view>
-      <view class="content">
-        <text>支付宝账号</text>
-        <input type='text' name="zfb" value="{{form.zfb}}" placeholder='支付宝账号'></input>
-      </view>
-      <view class="content">
-        <text>支付宝姓名</text>
-        <input type='text' name="name" value="{{form.name}}" placeholder='支付宝姓名'></input>
-      </view>
-      <view class="save">
-        <button form-type="submit">登录</button>
-      </view>
-    </form>
+    推荐码生成
   </view>
 </view>

+ 0 - 34
pages/setting/setting.wxss

@@ -22,38 +22,4 @@
   top: 80rpx;
   width: 100%;
   margin: 20rpx 0 0 0;
-}
-
-.main .two .content {
-  float: left;
-  width: 94%;
-  height: 80rpx;
-  line-height: 80rpx;
-  margin: 0 20rpx;
-  border-bottom: 1px solid #ccc;
-}
-
-
-.main .two .content text {
-  float: left;
-  width: 30%;
-  font-size: 30rpx;
-}
-
-.main .two .content input {
-  float: left;
-  width: 70%;
-  padding: 18rpx 0;
-}
-
-.main .two .save {
-  float: left;
-  width: 94%;
-  margin: 60rpx 20rpx 0 20rpx;
-}
-
-.main .two .save button {
-  border-radius: 50rpx;
-  background-color: #ff0000;
-  color: #ffffff;
 }

+ 0 - 19
pages/team/team.js

@@ -18,13 +18,6 @@ moment.locale('en', {
       ],
       province: '',
       form: {},
-      // 类型
-      typeList: [
-        { name: '全部' },
-        { name: '余额' },
-        { name: '花呗' },
-        { name: '微信' },
-      ],
       // 套餐列表
       mealList: [
         { name: '全部' },
@@ -49,18 +42,6 @@ moment.locale('en', {
     provinceChange: function (e) {
       this.setData({ "province": this.data.provinceList[e.detail.value].name })
     },
-    // 选择类型
-    typeChange: function (e) {
-      let value = parseInt(e.detail.value);
-      if (value) {
-        let value = this.data.typeList[e.detail.value].name;
-        this.setData({ "form.type": value });
-      } else {
-        this.setData({ "form.type": e.detail.value });
-      }
-      // 调用查询方法
-      this.search(this.data.form);
-    },
     // 选择套餐
     mealChange: function (e) {
       let value = Number(e.detail.value);

+ 0 - 16
pages/team/team.wxml

@@ -16,13 +16,6 @@
         </view>
       </view>
       <view class="topTwo">
-        <view class="topTwoView">
-          <picker class="createTime" bindchange="typeChange" name="type" range="{{typeList}}" range-key="{{'name'}}">
-            <view class="picker textOver">{{form.type||'类型'}}
-              <van-icon name="arrow-down" />
-            </view>
-          </picker>
-        </view>
         <view class="topTwoView">
           <picker class="createTime" bindchange="mealChange" name="meal" value="{{form.meal}}" range="{{mealList}}"
             range-key="{{'name'}}">
@@ -70,15 +63,6 @@
 <van-popup show="{{ show }}" position="right" custom-style="height: 100%;width:100%;" bind:close="onClose">
   <form bindsubmit="formSubmit" bindreset="formReset">
     <view class="popup">
-      <view class="one">
-        <view class="title"> 类型 </view>
-        <view class="radio">
-          <radio-group name="type" bindchange="typeChange">
-            <label wx:for="{{typeList}}" wx:key="unique">
-              <radio value="{{item.name}}" color="#ff0000" />{{item.name}}</label>
-          </radio-group>
-        </view>
-      </view>
       <view class="one">
         <view class="title">套餐</view>
         <view class="radio">

+ 1 - 1
pages/team/team.wxss

@@ -61,7 +61,7 @@
 
 .main .two .top .topTwo .topTwoView {
   float: left;
-  width: 25%;
+  width: 33%;
   text-align: center;
 }
 

+ 1 - 1
project.config.json

@@ -4,7 +4,7 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": true,
+    "urlCheck": false,
     "es6": true,
     "enhance": false,
     "postcss": true,