From 359f0754d41de69a2a400f1e477d94047ac65769 Mon Sep 17 00:00:00 2001
From: initwithout <initwithout@163.com>
Date: Mon, 17 Apr 2023 16:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=87=8D?=
 =?UTF-8?q?=E5=86=99=20=E5=AF=B9=E6=8E=A5=E8=AE=A2=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=20=E5=8A=A0=E5=85=A5=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/template/grouplist.wxml  |  29 -----
 pages/template/loading.wxml    |  11 --
 pages/template/orderslist.wxml |  57 ---------
 pages/template/toast.wxml      |   7 --
 pages/template/tobuy.wxml      |  28 -----
 utils/MD5Encode.js             | 223 ---------------------------------
 utils/common.js                | 117 -----------------
 7 files changed, 472 deletions(-)
 delete mode 100644 pages/template/grouplist.wxml
 delete mode 100644 pages/template/loading.wxml
 delete mode 100644 pages/template/orderslist.wxml
 delete mode 100644 pages/template/toast.wxml
 delete mode 100644 pages/template/tobuy.wxml
 delete mode 100644 utils/MD5Encode.js
 delete mode 100644 utils/common.js

diff --git a/pages/template/grouplist.wxml b/pages/template/grouplist.wxml
deleted file mode 100644
index 72bd226..0000000
--- a/pages/template/grouplist.wxml
+++ /dev/null
@@ -1,29 +0,0 @@
-<import src="/pages/template/loading.wxml"/>
-<template name="groupList">
-<view wx:if="{{groupList.length>0}}">
-<block wx:for="{{groupList}}" wx:key="unique">
-	<view class="group-item bg-fff mt-10" bindtap="showGoodsDetail" data-id="{{item.pro_id}}" data-sum="{{item.sum}}">
-		<view class="goods-img p-20"><image src="{{item.img}}" mode="aspectFill"></image></view>
-		<view class="goods-info pull-right p-20">
-			<view class="goods-title">{{item.name}}</view>
-			<text class="color-ccc">{{item.groupNum}}人团</text>
-			<text class="goods-price">¥{{item.totalPrice}}</text>
-			<view class="pull-right text-red">{{item.groupStatus}}</view>
-		</view>
-		<view class="clearfix"></view>
-	</view>
-	<view class="user-option bg-fff pull-right">
-		<view class="pull-right btn" bindtap="showOrderInfo" data-id="{{item.ptordercode}}">查看订单详情</view>
-		<view class="pull-right btn" bindtap="showGroupInfo" data-id="{{item.ptcode}}" data-pid="{{item.pro_id}}">查看团详情</view>
-	</view>
-	<view class="clearfix"></view>
-</block>
-<template is="loading" data="{{loading:loading}}"/>
-</view>
-<view wx:else class="no-group">
-	<view class="text-center">
-		<image src="../../images/group/no-orders.png"></image>
-		<view class="mt-20">您没有相关订单</view>
-	</view>
-</view>
-</template>
\ No newline at end of file
diff --git a/pages/template/loading.wxml b/pages/template/loading.wxml
deleted file mode 100644
index 5884aa1..0000000
--- a/pages/template/loading.wxml
+++ /dev/null
@@ -1,11 +0,0 @@
-<template name="loading">
-<view class="loading text-center">
-<block wx:if="{{loading}}">
-<image src="/images/group/loading-black.svg"></image>
-<view class="">正在加载</view>
-</block>
-<block wx:else>
-<view class="no-data">没有更多数据了</view>
-</block>
-</view>
-</template>
\ No newline at end of file
diff --git a/pages/template/orderslist.wxml b/pages/template/orderslist.wxml
deleted file mode 100644
index 6c271fa..0000000
--- a/pages/template/orderslist.wxml
+++ /dev/null
@@ -1,57 +0,0 @@
-<import src="/pages/template/loading.wxml"/>
-<template name="ordersList">
-
-<view wx:if="{{ordersList.length>0}}" class="t">
-
-<view wx:for="{{ordersList}}" wx:key="unique" class="order-group mt-10">
-  	<view class="group-msg bg-fff pull-left">
-			<text class="order-num pull-left">订单编号：{{item.orderNum}}</text>
-  		<text class="pull-right order-status">{{item.orderStatus}}</text>
-  	</view>
-
-  	<view class="order-goods pull-left" bindtap="showOrderDetail" data-id="{{item.oid}}">
-			<view class="goods-img pull-left"><image src="{{item.img}}" mode="aspectFill"></image></view>
-			<view class="goods-info pull-right">
-				<view class="goods-title pull-left">{{item.name}}</view>
-				<view class="goods-price pull-right">￥{{item.gprice}}</view>
-				<view class="goods-prop pull-left">
-					<view wx:for="{{item.goodsProp}}" wx:key="unique" wx:for-item="prop" class="prop-item pull-left">
-					<view><text>{{prop.pname}}</text>:<text>{{prop.name}}</text></view>
-					</view>
-					<view class="goods-num pull-right">x{{item.goodsNum}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="clearfix"></view>
-
-		<view class="order-price bg-fff pull-left">
-			实付：<text>¥{{item.totalPrice}}</text>
-		</view>
-
-		<view class="user-option bg-fff clearfix">
-			<view style="padding-right: 24rpx;">			
-			<!-- <view class="btn">取消订单</view>
-			<view class="btn">去支付</view> -->
-	      <block wx:if="{{item.orderStatus == '待付款'}}">
-	      <view class="btn btn-danger" bindtap="toPay" data-id="{{item.oid}}">去支付</view>
-	      </block>
-	      <block wx:if="{{item.orderStatus == '待成团'}}">
-				<view class="btn btn-danger" bindtap="toGroupDetail" data-id="{{item.oid}}">邀请好友开团</view>
-	      </block>
-	      <block wx:if="{{item.orderStatus=='待收货'}}">
-	      	<view class="btn btn-danger" bindtap="confirmReceipt" data-id="{{item.oid}}">确认收货</view>
-	      </block>
-			</view>
-		</view>
-</view>
-<template is="loading" data="{{loading:loading}}"/>
-
-</view>
-<view wx:else class="no-orders">
-	<view class="text-center">
-		<image src="/resource/no-orders.png"></image>
-		<view class="mt-20">您没有相关订单</view>
-	</view>
-</view>
-  
-</template>
\ No newline at end of file
diff --git a/pages/template/toast.wxml b/pages/template/toast.wxml
deleted file mode 100644
index 11a401a..0000000
--- a/pages/template/toast.wxml
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="toast">
-<view class="toast" wx:if="{{toast.toastStatus}}">
-	<view class="toast-mask" animation="{{toast.toastAnimationData}}" wx:if="{{toast.toastStatus}}">
-		<view class="toast-titile">{{toast.toastTitle}}</view>
-	</view>
-</view>
-</template>
\ No newline at end of file
diff --git a/pages/template/tobuy.wxml b/pages/template/tobuy.wxml
deleted file mode 100644
index c33b27c..0000000
--- a/pages/template/tobuy.wxml
+++ /dev/null
@@ -1,28 +0,0 @@
-<template name="tobuy">
-	<view class="drawer_screen" bindtap="showModal" data-statu="close" wx:if="{{showModalStatus}}"></view>
-	<view class="modal" animation="{{animationData}}" wx:if="{{showModalStatus}}" >
-		<text class="modal-close pull-right" bindtap="showModal" data-statu="close">x</text>
-		<view class="clearfix"></view>
-		<view class="modal-title">
-			<view class="goods-img"><image src="{{goodsDetail.img}}" mode="aspectFit"></image></view>
-			<view class="goods-price">¥{{goodsPrice}}</view>
-		</view>
-		<view class="modal-body">
-			<view class="prop" wx:for="{{goodsDetail.property}}" wx:key="unique" wx:for-index="index">
-				<view>{{item.name}}</view>
-				<block wx:for="{{item.value}}" wx:key="unique" wx:for-item="prop" wx:for-index="ind">
-					<text class="{{propValue[index].pname==item.name&&propValue[index].name==prop ?'selected':''}}" data-pid="{{index}}" data-pname="{{item.name}}" data-name="{{prop}}" bindtap="selectProp">{{prop}}</text>
-				</block>
-			</view>
-		</view>
-		<view class="number pull-left">
-			<text class="pull-left" style="padding:10rpx 20rpx;">数量</text>
-			<text class="plus pull-right" bindtap="plus">十</text>
-			<text class="buy-value pull-right">{{num}}</text>
-			<text class="minus pull-right" bindtap="minus">一</text>
-		</view>
-		<view class="modal-footer">
-			<view class="btn" bindtap="goToBuy">确定</view>
-		</view>
-	</view>
-</template>
\ No newline at end of file
diff --git a/utils/MD5Encode.js b/utils/MD5Encode.js
deleted file mode 100644
index d2914cd..0000000
--- a/utils/MD5Encode.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/*  
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message  
- * Digest Algorithm, as defined in RFC 1321.  
- * Version 1.1 Copyright (C) Paul Johnston 1999 - 2002.  
- * Code also contributed by Greg Holt  
- * See http://pajhome.org.uk/site/legal.html for details.  
- */    
-    
-/*  
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally  
- * to work around bugs in some JS interpreters.  
- */    
-function safe_add(x, y)    
-{    
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF)    
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16)    
-  return (msw << 16) | (lsw & 0xFFFF)    
-}    
-    
-/*  
- * Bitwise rotate a 32-bit number to the left.  
- */    
-function rol(num, cnt)    
-{    
-  return (num << cnt) | (num >>> (32 - cnt))    
-}    
-    
-/*  
- * These functions implement the four basic operations the algorithm uses.  
- */    
-function cmn(q, a, b, x, s, t)    
-{    
-  return safe_add(rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b)    
-}    
-function ff(a, b, c, d, x, s, t)    
-{    
-  return cmn((b & c) | ((~b) & d), a, b, x, s, t)    
-}    
-function gg(a, b, c, d, x, s, t)    
-{    
-  return cmn((b & d) | (c & (~d)), a, b, x, s, t)    
-}    
-function hh(a, b, c, d, x, s, t)    
-{    
-  return cmn(b ^ c ^ d, a, b, x, s, t)    
-}    
-function ii(a, b, c, d, x, s, t)    
-{    
-  return cmn(c ^ (b | (~d)), a, b, x, s, t)    
-}    
-    
-/*  
- * Calculate the MD5 of an array of little-endian words, producing an array  
- * of little-endian words.  
- */    
-function coreMD5(x)    
-{    
-  var a =  1732584193    
-  var b = -271733879    
-  var c = -1732584194    
-  var d =  271733878    
-    
-  for(var i = 0; i < x.length; i += 16)    
-  {    
-    var olda = a    
-    var oldb = b    
-    var oldc = c    
-    var oldd = d    
-    
-    a = ff(a, b, c, d, x[i+ 0], 7 , -680876936)    
-    d = ff(d, a, b, c, x[i+ 1], 12, -389564586)    
-    c = ff(c, d, a, b, x[i+ 2], 17,  606105819)    
-    b = ff(b, c, d, a, x[i+ 3], 22, -1044525330)    
-    a = ff(a, b, c, d, x[i+ 4], 7 , -176418897)    
-    d = ff(d, a, b, c, x[i+ 5], 12,  1200080426)    
-    c = ff(c, d, a, b, x[i+ 6], 17, -1473231341)    
-    b = ff(b, c, d, a, x[i+ 7], 22, -45705983)    
-    a = ff(a, b, c, d, x[i+ 8], 7 ,  1770035416)    
-    d = ff(d, a, b, c, x[i+ 9], 12, -1958414417)    
-    c = ff(c, d, a, b, x[i+10], 17, -42063)    
-    b = ff(b, c, d, a, x[i+11], 22, -1990404162)    
-    a = ff(a, b, c, d, x[i+12], 7 ,  1804603682)    
-    d = ff(d, a, b, c, x[i+13], 12, -40341101)    
-    c = ff(c, d, a, b, x[i+14], 17, -1502002290)    
-    b = ff(b, c, d, a, x[i+15], 22,  1236535329)    
-    
-    a = gg(a, b, c, d, x[i+ 1], 5 , -165796510)    
-    d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632)    
-    c = gg(c, d, a, b, x[i+11], 14,  643717713)    
-    b = gg(b, c, d, a, x[i+ 0], 20, -373897302)    
-    a = gg(a, b, c, d, x[i+ 5], 5 , -701558691)    
-    d = gg(d, a, b, c, x[i+10], 9 ,  38016083)    
-    c = gg(c, d, a, b, x[i+15], 14, -660478335)    
-    b = gg(b, c, d, a, x[i+ 4], 20, -405537848)    
-    a = gg(a, b, c, d, x[i+ 9], 5 ,  568446438)    
-    d = gg(d, a, b, c, x[i+14], 9 , -1019803690)    
-    c = gg(c, d, a, b, x[i+ 3], 14, -187363961)    
-    b = gg(b, c, d, a, x[i+ 8], 20,  1163531501)    
-    a = gg(a, b, c, d, x[i+13], 5 , -1444681467)    
-    d = gg(d, a, b, c, x[i+ 2], 9 , -51403784)    
-    c = gg(c, d, a, b, x[i+ 7], 14,  1735328473)    
-    b = gg(b, c, d, a, x[i+12], 20, -1926607734)    
-    
-    a = hh(a, b, c, d, x[i+ 5], 4 , -378558)    
-    d = hh(d, a, b, c, x[i+ 8], 11, -2022574463)    
-    c = hh(c, d, a, b, x[i+11], 16,  1839030562)    
-    b = hh(b, c, d, a, x[i+14], 23, -35309556)    
-    a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060)    
-    d = hh(d, a, b, c, x[i+ 4], 11,  1272893353)    
-    c = hh(c, d, a, b, x[i+ 7], 16, -155497632)    
-    b = hh(b, c, d, a, x[i+10], 23, -1094730640)    
-    a = hh(a, b, c, d, x[i+13], 4 ,  681279174)    
-    d = hh(d, a, b, c, x[i+ 0], 11, -358537222)    
-    c = hh(c, d, a, b, x[i+ 3], 16, -722521979)    
-    b = hh(b, c, d, a, x[i+ 6], 23,  76029189)    
-    a = hh(a, b, c, d, x[i+ 9], 4 , -640364487)    
-    d = hh(d, a, b, c, x[i+12], 11, -421815835)    
-    c = hh(c, d, a, b, x[i+15], 16,  530742520)    
-    b = hh(b, c, d, a, x[i+ 2], 23, -995338651)    
-    
-    a = ii(a, b, c, d, x[i+ 0], 6 , -198630844)    
-    d = ii(d, a, b, c, x[i+ 7], 10,  1126891415)    
-    c = ii(c, d, a, b, x[i+14], 15, -1416354905)    
-    b = ii(b, c, d, a, x[i+ 5], 21, -57434055)    
-    a = ii(a, b, c, d, x[i+12], 6 ,  1700485571)    
-    d = ii(d, a, b, c, x[i+ 3], 10, -1894986606)    
-    c = ii(c, d, a, b, x[i+10], 15, -1051523)    
-    b = ii(b, c, d, a, x[i+ 1], 21, -2054922799)    
-    a = ii(a, b, c, d, x[i+ 8], 6 ,  1873313359)    
-    d = ii(d, a, b, c, x[i+15], 10, -30611744)    
-    c = ii(c, d, a, b, x[i+ 6], 15, -1560198380)    
-    b = ii(b, c, d, a, x[i+13], 21,  1309151649)    
-    a = ii(a, b, c, d, x[i+ 4], 6 , -145523070)    
-    d = ii(d, a, b, c, x[i+11], 10, -1120210379)    
-    c = ii(c, d, a, b, x[i+ 2], 15,  718787259)    
-    b = ii(b, c, d, a, x[i+ 9], 21, -343485551)    
-    
-    a = safe_add(a, olda)    
-    b = safe_add(b, oldb)    
-    c = safe_add(c, oldc)    
-    d = safe_add(d, oldd)    
-  }    
-  return [a, b, c, d]    
-}    
-    
-/*  
- * Convert an array of little-endian words to a hex string.  
- */    
-function binl2hex(binarray)    
-{    
-  var hex_tab = "0123456789abcdef"    
-  var str = ""    
-  for(var i = 0; i < binarray.length * 4; i++)    
-  {    
-    str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +    
-           hex_tab.charAt((binarray[i>>2] >> ((i%4)*8)) & 0xF)    
-  }    
-  return str    
-}    
-    
-/*  
- * Convert an array of little-endian words to a base64 encoded string.  
- */    
-function binl2b64(binarray)    
-{    
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"    
-  var str = ""    
-  for(var i = 0; i < binarray.length * 32; i += 6)    
-  {    
-    str += tab.charAt(((binarray[i>>5] << (i%32)) & 0x3F) |    
-                      ((binarray[i>>5+1] >> (32-i%32)) & 0x3F))    
-  }    
-  return str    
-}    
-    
-/*  
- * Convert an 8-bit character string to a sequence of 16-word blocks, stored  
- * as an array, and append appropriate padding for MD4/5 calculation.  
- * If any of the characters are >255, the high byte is silently ignored.  
- */    
-function str2binl(str)    
-{    
-  var nblk = ((str.length + 8) >> 6) + 1 // number of 16-word blocks    
-  var blks = new Array(nblk * 16)    
-  for(var i = 0; i < nblk * 16; i++) blks[i] = 0    
-  for(var i = 0; i < str.length; i++)    
-    blks[i>>2] |= (str.charCodeAt(i) & 0xFF) << ((i%4) * 8)    
-  blks[i>>2] |= 0x80 << ((i%4) * 8)    
-  blks[nblk*16-2] = str.length * 8    
-  return blks    
-}    
-    
-/*  
- * Convert a wide-character string to a sequence of 16-word blocks, stored as  
- * an array, and append appropriate padding for MD4/5 calculation.  
- */    
-function strw2binl(str)    
-{    
-  var nblk = ((str.length + 4) >> 5) + 1 // number of 16-word blocks    
-  var blks = new Array(nblk * 16)    
-  for(var i = 0; i < nblk * 16; i++) blks[i] = 0    
-  for(var i = 0; i < str.length; i++)    
-    blks[i>>1] |= str.charCodeAt(i) << ((i%2) * 16)    
-  blks[i>>1] |= 0x80 << ((i%2) * 16)    
-  blks[nblk*16-2] = str.length * 16    
-  return blks    
-}    
-    
-/*  
- * External interface  
- */    
-function hexMD5 (str) { return binl2hex(coreMD5( str2binl(str))) }    
-function hexMD5w(str) { return binl2hex(coreMD5(strw2binl(str))) }    
-function b64MD5 (str) { return binl2b64(coreMD5( str2binl(str))) }    
-function b64MD5w(str) { return binl2b64(coreMD5(strw2binl(str))) }    
-/* Backward compatibility */    
-function calcMD5(str) { return binl2hex(coreMD5( str2binl(str))) }    
-
-
-
-module.exports = {    
-  hexMD5: hexMD5    
-}    
\ No newline at end of file
diff --git a/utils/common.js b/utils/common.js
deleted file mode 100644
index 8393e76..0000000
--- a/utils/common.js
+++ /dev/null
@@ -1,117 +0,0 @@
-var app = getApp();
-var MD5Encode = require("MD5Encode.js");
-
-/**
- * 对字符串判空
- */
-function isStringEmpty(data) {
-    if (null == data || "" == data) {
-        return true;
-    }
-    return false;
-}
-
-/**
- * 封装网络请求
- */
-function sentHttpRequestToServer(uri, data, method, successCallback, failCallback, completeCallback) {
-    wx.request({
-        url: app.d.hostUrl + uri,
-        data: data,
-        method: method,
-        header: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        success: successCallback,
-        fail: failCallback,
-        complete: completeCallback
-    })
-}
-
-/**
- * 将map对象转换为json字符串
- */
-function mapToJson(map) {
-    if (null == map) {
-        return null;
-    }
-    var jsonString = "{";
-    for (var key in map) {
-        jsonString = jsonString + key + ":" + map[key] + ",";
-    }
-    if ("," == jsonString.charAt(jsonString.length - 1)) {
-        jsonString = jsonString.substring(0, jsonString.length - 1);
-    }
-    jsonString += "}";
-    return jsonString;
-}
-
-/**
- * 弹窗提示成功
- */
-function toastSuccess() {
-    wx.showToast({
-        title: '成功',
-        icon: 'success',
-        duration: 2000
-    })
-}
-
-/**
- * 调用微信支付
- */
-function doWechatPay(prepayId, successCallback, failCallback, completeCallback) {
-    var nonceString = getRandomString();
-    var currentTimeStamp = getCurrentTimeStamp();
-    var packageName = "prepay_id=" + prepayId;
-    var dataMap = {
-        timeStamp: currentTimeStamp,
-        nonceStr: nonceString,
-        package: packageName,
-        signType: "MD5",
-        paySign: getWechatPaySign(nonceString, packageName, currentTimeStamp),
-        success: successCallback,
-        fail: failCallback,
-        complete: completeCallback
-    }
-    console.log(dataMap);
-    wx.requestPayment(dataMap);
-}
-
-/**
- * 获取微信支付签名字符串
- */
-function getWechatPaySign(nonceStr, packageName, timeStamp) {
-    var beforMD5 = "appid=" + app.d.appId + "&nonceStr=" + nonceStr + "&package=" + packageName + "&signType=MD5" + "&timeStamp=" + timeStamp + "&key=" + app.d.appKey;
-    return doMD5Encode(beforMD5).toUpperCase();
-}
-
-/**
- * 获取当前时间戳
- */
-function getCurrentTimeStamp() {
-    var timestamp = Date.parse(new Date());
-    return timestamp + "";
-}
-
-/**
- * 获取随机字符串，32位以下
- */
-function getRandomString() {
-    return Math.random().toString(36).substring(3, 8);
-}
-
-/**
- * MD5加密
- */
-function doMD5Encode(toEncode) {
-    return MD5Encode.hexMD5(toEncode);
-}
-
-module.exports = {
-    isStringEmpty: isStringEmpty,
-    sentHttpRequestToServer: sentHttpRequestToServer,
-    mapToJson: mapToJson,
-    toastSuccess: toastSuccess,
-    doWechatPay: doWechatPay
-}
\ No newline at end of file