修改mall4m登录

mall4m/app.js

@@ -2,7 +2,7 @@
 var http = require("utils/http.js");
 App({
   onLaunch: function () {
-    http.getToken();
+    // http.getToken();
     // wx.getSetting({
     //   success(res) {
     //     if (!res.authSetting['scope.userInfo']) {

mall4m/app.json

@@ -1,6 +1,5 @@
 {
     "pages": [
-    
         "pages/index/index",
         "pages/logs/logs",
         "pages/user/user",

mall4m/package-lock.json

@@ -0,0 +1,28 @@
+{
+  "name": "mall4m",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "mall4m",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "crypto-js": "^4.1.1"
+      }
+    },
+    "node_modules/crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+    }
+  },
+  "dependencies": {
+    "crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+    }
+  }
+}

mall4m/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "mall4m",
+  "version": "1.0.0",
+  "description": "一个基于vue、element ui 的轻量级、前后端分离、拥有完整sku和下单流程的完全开源商城 小程序端",
+  "main": "app.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/gz-yami/mall4m.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "crypto-js": "^4.1.1"
+  }
+}

mall4m/pages/basket/basket.js

@@ -38,6 +38,7 @@ Page({
 	this.loadBasketData();
     http.getCartCount();//重新计算购物车总数量
   },
+  
   loadBasketData(){
 		wx.showLoading(); //加载购物车
 		

mall4m/pages/delivery-address/delivery-address.wxss

@@ -51,7 +51,8 @@ page {
 .personal .addr .addr-get {
   display: inline-block;
   color: #999;
-  width: 85%;
+  width: 100%;
+  word-break: break-word;
 }
 
 .address .select-btn {

mall4m/pages/index/index.js

@@ -26,7 +26,6 @@ Page({
   },
   onLoad: function() {
     this.getAllData();
-
   },
 
   // 页面滚动到指定位置指定元素固定在顶部
@@ -80,17 +79,6 @@ Page({
   },
 
   onShow: function() {
-    wx.getSetting({
-      success(res) {
-        if (!res.authSetting['scope.userInfo']) {
-          wx.navigateTo({
-            url: '/pages/login/login',
-          })
-        }
-      }
-    })
-
-	http.getCartCount(); //重新计算购物车总数量
   },
   getAllData() {
     http.getCartCount(); //重新计算购物车总数量

mall4m/pages/login/login.js

@@ -1,11 +1,17 @@
 var http = require("../../utils/http.js");
+var crypto = require("../../utils/crypto.js");
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    // 用户名
+    userName: '',
+    // 密码
+    password: '',
+    // 是否显示注册
+    isRegister: false
   },
 
   onGotUserInfo: function (res) {
@@ -19,7 +25,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      isRegister: options.isRegister == 0
+    })
   },
 
   /**
@@ -69,5 +77,66 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  
+  /**
+   * 输入框的值
+   */
+  getInputVal: function(e) {
+    const type = e.currentTarget.dataset.type
+    if (type == 'account') {
+      this.setData({
+        userName: e.detail.value
+      })
+    } else if (type == 'password') {
+      this.setData({
+        password: e.detail.value
+      })
+    }
+  },
+
+  /**
+   * 切换注册/登录
+   */
+  handleChangeShowType() {
+    let str =  this.data.isRegister ? '1' : '0'
+    wx.redirectTo({
+      url: '/pages/login/login?isRegister=' + str
+    })
+  },
+
+  /**
+   * 注册/登录按钮
+   */
+  handleLoginOrRegister() {
+    if (!this.data.userName.trim()) {
+      wx.showToast({
+        title: '请输入用户名',
+        icon: 'none'
+      })
+      return
+    }
+    if (!this.data.password.trim()) {
+      wx.showToast({
+        title: '请输入密码',
+        icon: 'none'
+      })
+      return
+    }
+    const params = {
+      url: this.data.isRegister ? '/user/register' : '/login',
+      method: "POST",
+      data: {
+        userName: this.data.userName,
+        passWord: crypto.encrypt(this.data.password)
+      },
+      callBack: (res) => {
+        wx.setStorageSync('token', res.accessToken)
+        wx.reLaunc({
+          url: '/pages/index/index',
+        })
+      }
+    };
+    http.request(params);
   }
 })

mall4m/pages/login/login.wxml

@@ -1,5 +1,26 @@
 <!--pages/login/login.wxml-->
 <image src='http://img-test.gz-yami.com/mini/logo.jpg' class='c-logo'></image>
 <view class="title">mall4j</view>
-<view class="msg">申请获得你的公开信息（昵称、头像等）</view>
+<view class="login-form">
-<button color="#eb2444"  open-type="getUserInfo" lang = "zh_CN" bindgetuserinfo = "onGotUserInfo" class=''>微信授权</button>
+    <view class="item">
+        <view class="account">
+            <text class="input-item">用户名</text>
+            <input type="text" data-type="account" placeholder-class="inp-palcehoder" placeholder="请输入用户名" bindinput="getInputVal"></input>
+        </view>
+    </view>
+    <view class="item">
+        <view class="account">
+            <text class="input-item">密码</text>
+            <input type="password" data-type="password" placeholder-class="inp-palcehoder" placeholder="请输入密码" bindinput="getInputVal"></input>
+        </view>
+    </view>
+    <view>
+        <button class="authorized-btn" bindtap="handleLoginOrRegister">{{isRegister ? '注册': '登录'}}</button>
+        <button class="to-idx-btn" bindtap="goBack">回到首页</button>
+    </view>
+    <view class="operate">
+        <view class="to-register" bindtap="handleChangeShowType">
+            {{isRegister?'已有账号？去登录>' : '没有账号？去注册>'}}
+        </view>
+    </view>
+</view>

mall4m/pages/login/login.wxss

@@ -23,7 +23,7 @@ view.title {
   color: #333;
   width: 100%;
   text-align: center;
-  margin-top: 20rpx;
+  margin: 20rpx 0;
 }
 
 button {
@@ -42,3 +42,105 @@ button {
   background-color: #fff;
   color: #eb2444;
 }
+
+page{
+  background: #fff;
+  height: 100%;
+}
+.con{
+  padding-top: 100rpx;
+}
+
+.logo {
+  display: flex;
+  justify-content: center;
+  height: 150rpx;
+  margin-bottom: 8%;
+}
+.logo image {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+.login-form{
+  width: 90%;
+  margin: 0 auto;
+  margin-bottom: 10%;
+}
+.authorized-btn {
+  width: 100%;
+  margin: 0 auto;
+  text-align: center;
+  background-color: #0ab906;
+  border: 1rpx solid #0ab906;
+  color: #fff;
+  border-radius: 6rpx;
+  font-size: 26rpx;
+  margin-top: 60rpx;
+}
+.to-idx-btn{
+	width: 100%;
+	margin: 0 auto;
+	text-align: center;
+  background-color: #eeeeee;
+  border: 1rpx solid #eeeeee;
+	color: #333;
+	border-radius: 6rpx;
+	font-size: 26rpx;
+	margin-top: 30rpx;
+}
+.form-title {
+  width: 100%;
+  margin-bottom: 50rpx;
+  font-size: 32rpx;
+  text-align: center;
+  color: #00a0e9;
+}
+.item {
+	display: block;
+	margin-bottom: 30rpx;
+}
+.account{
+  display: flex;
+  background: #f8f8f8;
+  padding: 15rpx;
+  box-sizing: border-box;
+  font-size: 26rpx;
+  align-items: center;
+}
+.account input{
+  padding-left: 20rpx;
+  width:75%;
+}
+.inp-palcehoder{
+  font-size: 26rpx;
+}
+.account input.int-yzm {
+  width: 410rpx;
+  padding-right: 10rpx;
+  box-sizing: border-box;
+}
+.input-btn {
+  width: 152rpx;
+  font-size: 26rpx;
+  color: #00a0ea;
+  text-align: center;
+}
+
+button::after{
+  border: 0 !important;
+}
+
+/* 去注册 */
+.operate {
+	display: flex;
+	justify-content: space-between;
+  align-items: center;
+  margin-top: 20rpx;
+}
+.forgot-password,
+.to-register {
+	font-size: 28rpx;
+	color: #00AAFF;
+}

mall4m/pages/order-detail/order-detail.js

@@ -17,8 +17,6 @@ Page({
     productTotalAmount: '',
     transfee: '',
     reduceAmount: '',
-    actualTotal: '',
-    prodid: '',
     shopId: '',
     prodid: ''
   },
@@ -31,6 +29,44 @@ Page({
     })
   },
 
+  /**
+   * 加入购物车
+   */
+  addToCart: function(event) {
+    let index = event.currentTarget.dataset.index
+    // if (!this.orderItemDtos) {
+    //   console.log(1213)
+    //   return;
+    // }
+    var ths = this;
+    wx.showLoading({
+      mask: true
+    });
+    var params = {
+      url: "/p/shopCart/changeItem",
+      method: "POST",
+      data: {
+        basketId: 0,
+        count: this.data.orderItemDtos[index].prodCount,
+        prodId: this.data.orderItemDtos[index].prodId,
+        shopId: this.data.shopId,
+        skuId: this.data.orderItemDtos[index].skuId
+      },
+      callBack: function(res) {
+        //console.log(res);
+        wx.hideLoading();
+        wx.showToast({
+          title: "加入购物车成功",
+          icon: "none"
+        })
+        wx.switchTab({
+          url: '/pages/basket/basket',
+        })
+      }
+    };
+    http.request(params);
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -73,44 +109,6 @@ Page({
 
   },
 
-    /**
-   * 加入购物车
-   */
-     addToCart: function(event) {
-      let index = event.currentTarget.dataset.index
-      // if (!this.orderItemDtos) {
-      //   console.log(1213)
-      //   return;
-      // }
-      var ths = this;
-      wx.showLoading({
-        mask: true
-      });
-      var params = {
-        url: "/p/shopCart/changeItem",
-        method: "POST",
-        data: {
-          basketId: 0,
-          count: this.data.orderItemDtos[index].prodCount,
-          prodId: this.data.orderItemDtos[index].prodId,
-          shopId: this.data.shopId,
-          skuId: this.data.orderItemDtos[index].skuId
-        },
-        callBack: function(res) {
-          //console.log(res);
-          wx.hideLoading();
-          wx.showToast({
-            title: "加入购物车成功",
-            icon: "none"
-          })
-          wx.switchTab({
-            url: '/pages/basket/basket',
-          })
-        }
-      };
-      http.request(params);
-    },
-
 
   /**
    * 生命周期函数--监听页面初次渲染完成

mall4m/pages/order-detail/order-detail.wxml

@@ -20,7 +20,7 @@
           <text class="order-sts  gray">{{status}}</text>
         </view>
       </view> -->
-      <block wx:for="{{orderItemDtos}}" wx:key=''>
+      <block wx:for="{{orderItemDtos}}"  wx:for-index="index" wx:key='index'>
         <view class='item-cont' bindtap='toProdPage' data-prodid="{{item.prodId}}">
           <view class='prod-pic'>
             <image src='{{item.pic}}'></image>
@@ -38,7 +38,7 @@
               <text class='big-num'>{{wxs.parsePrice(item.price)[0]}}</text>
               <text class='small-num'>.{{wxs.parsePrice(item.price)[1]}}</text></text>
               <view class='btn-box'>
-                <text class='btn'>申请售后</text>
+                <text class='btn' wx:if="{{item.status!=1}}">申请售后</text>
                 <text class='btn' data-index='{{index}}' catchtap='addToCart'>加购物车</text>
               </view>
             </view>
@@ -62,7 +62,7 @@
             <text class='big-num'>{{wxs.parsePrice(40.00)[0]}}</text>
             <text class='small-num'>.{{wxs.parsePrice(40.00)[1]}}</text></text>
             <view class='btn-box'>
-              <text class='btn' wx:if="{{item.status!=1}}">申请售后</text>
+              <text class='btn'>申请售后</text>
               <text class='btn'>加购物车</text>
             </view>
           </view>

mall4m/pages/prod-classify/prod-classify.wxml

@@ -1,8 +1,8 @@
 <!--pages/prod-classify/prod-classify.wxml-->
 
 <view class='container'>
-  <!-- <view class='line-fix'></view> -->
+  <!-- <view class='line-fix'></view>
-  <!-- <view class='tit-background'></view> -->
+  <view class='tit-background'></view> -->
   <view>
     <block wx:for="{{prodList}}" wx:key ="key">
       <prod item="{{item}}" ></prod>

mall4m/pages/submit-order/submit-order.js

@@ -122,6 +122,12 @@ Page({
     }
   },
 
+  onRemarksInput: function (e) {
+    this.setData({
+      remarks: e.detail.value
+    });
+  },
+
   /**
    * 提交订单
    */

mall4m/pages/submit-order/submit-order.wxml

@@ -85,7 +85,7 @@
         </view>
         <view class='item'>
           <text>买家留言：</text>
-          <input placeholder='给卖家留言'></input>
+          <input value='{{remarks}}' placeholder='给卖家留言' bindinput="onRemarksInput"></input>
         </view>
       </view>
 

mall4m/project.config.json

@@ -4,19 +4,37 @@
         "ignore": []
     },
     "setting": {
-    "urlCheck": false,
+        "urlCheck": true,
-    "es6": true,
+        "scopeDataCheck": false,
+        "coverView": true,
+        "es6": false,
         "postcss": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "preloadBackgroundData": false,
         "minified": true,
-    "newFeature": true,
-    "nodeModules": false,
         "autoAudits": false,
-		"checkInvalidKey": true
+        "newFeature": false,
+        "uglifyFileName": false,
+        "uploadWithSourceMap": true,
+        "useIsolateContext": false,
+        "nodeModules": false,
+        "enhance": true,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "ignoreUploadUnusedFiles": true,
+        "minifyWXML": true
     },
     "compileType": "miniprogram",
-  "libVersion": "2.6.4",
+    "libVersion": "2.23.2",
     "appid": "wx6fa71e69231a4fa4",
-  "projectname": "mall4j",
+    "projectname": "mall4m",
     "debugOptions": {
         "hidedInDevtools": []
     },
@@ -25,15 +43,12 @@
     "simulatorPluginLibVersion": {},
     "condition": {
         "search": {
-			"current": -1,
             "list": []
         },
         "conversation": {
-			"current": -1,
             "list": []
         },
         "plugin": {
-			"current": -1,
             "list": []
         },
         "game": {
@@ -41,7 +56,6 @@
             "list": []
         },
         "miniprogram": {
-			"current": 23,
             "list": []
         }
     }

mall4m/project.private.config.json

@@ -0,0 +1,25 @@
+{
+    "setting": {},
+    "condition": {
+        "plugin": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "登录",
+                    "pathName": "pages/login/login",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                }
+            ]
+        }
+    }
+}

mall4m/utils/config.js

@@ -1,3 +1,6 @@
-var domain = "http://127.0.0.1:8086"; //统一接口域名，测试环境
+//可改动页面
+
+var domain = "http://192.168.1.17:8386"; //统一接口域名，测试环境
 
 exports.domain = domain;
+

mall4m/utils/crypto.js

@@ -0,0 +1,11 @@
+import CryptoJS from 'crypto-js'
+// 加密
+const keyStr = '-mall4j-password' // 解密用的key
+export function encrypt(word) {
+  const time = Date.now()
+
+  const key = CryptoJS.enc.Utf8.parse(keyStr)
+  const srcs = CryptoJS.enc.Utf8.parse(time + word) // 加密方式: 时间戳 + 密文
+  const encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+  return encrypted.toString()
+}

mall4m/utils/http.js

@@ -5,10 +5,10 @@ function request(params, isGetTonken) {
   // 全局变量
   var globalData = getApp().globalData;
   // 如果正在进行登陆，就将非登陆请求放在队列中等待登陆完毕后进行调用
-  if (!isGetTonken && globalData.isLanding) {
+  // if (!isGetTonken && globalData.isLanding) {
-    globalData.requestQueue.push(params);
+  //   globalData.requestQueue.push(params);
-    return;
+  //   return;
-  }
+  // }
   wx.request({
     url: config.domain + params.url, //接口请求地址
     data: params.data,
@@ -32,14 +32,17 @@ function request(params, isGetTonken) {
           icon: "none"
         });
       } else if (res.statusCode == 401) {
-        // 添加到请求队列
+        wx.navigateTo({
-        globalData.requestQueue.push(params);
+          url: '/pages/login/login',
-        // 是否正在登陆
+        })
-        if (!globalData.isLanding) {
+        // // 添加到请求队列
-          globalData.isLanding = true
+        // globalData.requestQueue.push(params);
-          //重新获取token,再次请求接口
+        // // 是否正在登陆
-          getToken();
+        // if (!globalData.isLanding) {
-        }
+        //   globalData.isLanding = true
+        //   //重新获取token,再次请求接口
+        //   getToken();
+        // }
       } else if (res.statusCode == 400) {
         wx.showToast({
           title: res.data,