Merge remote-tracking branch 'origin/yijia' into yijia

addons/epay/certs/apiclient_cert.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEZTCCA86gAwIBAgIDHYb3MA0GCSqGSIb3DQEBBQUAMIGKMQswCQYDVQQGEwJD
+TjESMBAGA1UECBMJR3Vhbmdkb25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4GA1UE
+ChMHVGVuY2VudDEMMAoGA1UECxMDV1hHMRMwEQYDVQQDEwpNbXBheW1jaENBMR8w
+HQYJKoZIhvcNAQkBFhBtbXBheW1jaEB0ZW5jZW50MB4XDTE2MDQwNjEyNTAyNVoX
+DTI2MDQwNDEyNTAyNVowgZUxCzAJBgNVBAYTAkNOMRIwEAYDVQQIEwlHdWFuZ2Rv
+bmcxETAPBgNVBAcTCFNoZW56aGVuMRAwDgYDVQQKEwdUZW5jZW50MQ4wDAYDVQQL
+EwVNTVBheTEqMCgGA1UEAxQh6JyY6Jub6KGM572R57uc56eR5oqA5pyJ6ZmQ5YWs
+5Y+4MREwDwYDVQQEEwgxMTc3NDYwNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMJqPHEeUQvWZQWl5W/QvI/MR97jCY6iArnfPPkLBgWY6lEh7cGFn5Fq
+C2DsTHxuUC/7si9Sq5QHA2K8VaLk8qYDj2CurT0yRFVAVss/NYfPerZ6nHLbEB4p
+dYg6jUvQVWe7n5hJScq+89MNGUOpgF4uCCD/HyUDpRT8MFRQ+yGDTpuCjqZwexgM
+e0jNTKwvCXVwLcgR9LFknSiJCxDHAqauqd4r+ZAjDU4CZ/JWdeyLuRUqwxz4kECE
+S9iC79mhyo/KwoUupsZKp8RKacrhHybqMjgyZNFsVueLHjcDpYkMgrpUQU6QBJv6
+pLqOPejSQg99ddJNBTJJwwffU2mrDG0CAwEAAaOCAUYwggFCMAkGA1UdEwQCMAAw
+LAYJYIZIAYb4QgENBB8WHSJDRVMtQ0EgR2VuZXJhdGUgQ2VydGlmaWNhdGUiMB0G
+A1UdDgQWBBTIibbUnV9kTejncwyzXb81/xqj9TCBvwYDVR0jBIG3MIG0gBQ+BSb2
+ImK0FVuIzWR+sNRip+WGdKGBkKSBjTCBijELMAkGA1UEBhMCQ04xEjAQBgNVBAgT
+CUd1YW5nZG9uZzERMA8GA1UEBxMIU2hlbnpoZW4xEDAOBgNVBAoTB1RlbmNlbnQx
+DDAKBgNVBAsTA1dYRzETMBEGA1UEAxMKTW1wYXltY2hDQTEfMB0GCSqGSIb3DQEJ
+ARYQbW1wYXltY2hAdGVuY2VudIIJALtUlyu8AOhXMA4GA1UdDwEB/wQEAwIGwDAW
+BgNVHSUBAf8EDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQAHelavW3WB
+2qBtcG0uEVPLYlWKMvYpO79QUaWPYWh9bywA9d2zqoM8LfWgkOJtmetNdiqh3RVf
+/DrKWsLalluaLIMEHuX2chnvtT7vIO4ILijgP/4MZ9k8Jpmi3tKUfFpJVA7E4MXa
+7vM5gl21FRuqB96m24tynWHjmgshc4Kk2g==
+-----END CERTIFICATE-----

addons/epay/certs/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCajxxHlEL1mUF
+peVv0LyPzEfe4wmOogK53zz5CwYFmOpRIe3BhZ+Ragtg7Ex8blAv+7IvUquUBwNi
+vFWi5PKmA49grq09MkRVQFbLPzWHz3q2epxy2xAeKXWIOo1L0FVnu5+YSUnKvvPT
+DRlDqYBeLggg/x8lA6UU/DBUUPshg06bgo6mcHsYDHtIzUysLwl1cC3IEfSxZJ0o
+iQsQxwKmrqneK/mQIw1OAmfyVnXsi7kVKsMc+JBAhEvYgu/ZocqPysKFLqbGSqfE
+SmnK4R8m6jI4MmTRbFbnix43A6WJDIK6VEFOkASb+qS6jj3o0kIPfXXSTQUyScMH
+31NpqwxtAgMBAAECggEALemSzo//SdFe2B+eeHKOJVNz4aIyXpnKFQUwTAwbZvT+
+2RwvHtWkol2txDzprzUKANrq8JwQYwvo88dQXgC9gRE0Kfv2c45Mbumb1bHevWz1
+KOT5z3IGc2kNFZfmSHIxySaZAQjFwXio8j2UqtL7usIaL1iwjTg4IyWPcEoTlI0Y
+reRXlZY5z+VpaDFQubFytF+5zlb7ck/lPa8B6IJXZTBBQC6zBhuxXPky8uAjiza1
+1C0EHcIIwA+jkVxRbV4e8e6VV4OPnjgok8rN0GPEPlJNo/Gs73vSCRNOYgz5QwTB
+7JgRc4eFEXLaX7ntZxhkrOjK1kJQ8hLxYQLvygA0zQKBgQD8+PmHg59Y4c6MkYYk
+Gxn8SK6QCtNns72uFi3DJAN9j7x3ZSb4PcjDao0e9BeOt2wKuX+kOyXtSbKA33o/
+izeevp9UF2eNhGWgGaU7kMAgylS/V/iIN4A4UuzOyPEYSa9LYLMeHwh+OtH6skqZ
+ZjRPaLyJYrhP8Ecqp1B7rmu4rwKBgQDEvdwvvpmiEbui91g2l9P1E/ik3f+VfOTR
+5qKtYHYtYdkZAmg+7B6V5f8BCjx7NScS9di8J5KEOuDAc/MXD+o9jDxlxsSmAXB4
+n6fqko/wHmG+Q6FXmFamO3mdj+ziKt6ykoNQWS3lzZ4KLHNC1lDwMsd6VmMMr3Ys
+iGH4nYYbowKBgDc7kRfCaDc6ziMo3tXhSPIpWFvA0VmSB/cLhqBVq6FtkaOr5S9M
+JhpsmDVK7B3P9Hn++Fx+QZCmh5/Vq1ZWaiVxz03H8mcWoi2ri8UOnLRMGObSKURs
+gcVKbcPUYbeA1xIpIdKQygTtiM0owlrt0rwHzSpd8Ioblx47+7mVYpWnAoGBAKgu
+QMZToZNoo0S5OiBZA6iyLNAKsgxA2n4QMSoSlpNO3L3DUAfR4odzN9zUukT8d+1+
+WYrmLRp6FlyOAdTKFwwMEClUlA/wlQuYN3uPVBoIbretqoNtx0yM9PZa7T2dNgfi
+tPv/b/vNHHdH7jPJbyEV123d4QgcCeIhp9ZWGikPAoGBAMUbx9snnBwswUae+Dv2
+NkH02dv7oPQnPWKbk8b1s/LQEuisYO+34Aofx1ik5MmAZBN/3x8Cn7/i0eOKEUnd
+TRsJuiiSFLYdNISDUBQ4R263uSewow9kagrk/lwQgZ/6pJSXQH9G1ycNeZxmR3dq
+XevCR+GjHIwTFaYo4XOBYoNw
+-----END PRIVATE KEY-----

addons/epay/config.php

@@ -11,16 +11,16 @@ return array (
     ),
     'value' => 
     array (
-      'appid' => '',
-      'app_id' => '',
-      'app_secret' => '',
+      'appid' => 'wxbe6da4af3e529e0c',
+      'app_id' => 'wxbe6da4af3e529e0c',
+      'app_secret' => '7c1b14020e87e9e213696e870da0e549',
       'miniapp_id' => '',
-      'mch_id' => '',
-      'key' => '',
-      'notify_url' => '/addons/epay/api/notifyx/type/wechat',
+      'mch_id' => '1329733601',
+      'key' => 'a6654d342eedd8e293692a3e211a5e53',
+      'notify_url' => '',
       'cert_client' => '/epay/certs/apiclient_cert.pem',
       'cert_key' => '/epay/certs/apiclient_key.pem',
-      'log' => 1,
+      'log' => '1',
     ),
     'rule' => '',
     'msg' => '',
@@ -39,9 +39,9 @@ return array (
     'value' => 
     array (
       'app_id' => '2016102100728544',
-      'notify_url' => '/addons/epay/api/notifyx/type/alipay',
-      'return_url' => '/addons/epay/api/returnx/type/alipay',
-      'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWLcTZsd8mWDJ12rPJrog3/0o0toQqOxf8boG9WeVQ+aUyA7AD6j46xFJgdDlTVqMoOn2ywsaa6rnPtQ06rhSmTgGsLKCNHGfkP4FkAQNa/2LGHYhe4dQ/aek75KjzR4Gabnv0QtgMabIMUcM1c4bbQBo2dSHVL8FExFBLK1jiXIRhyFMA+llD2Ir341Q3Mls5DWuXoTmx+NXlcjwOuN2/u7zsSvCdxGWX8wkkY2is+IKMZ5ODUg72toSCMCr76exkWFlzp4b9WsXPtMei3XZpX4jQk6gy0gu8cAo3R7DpYMxIjNaP4YXOL6i/xTj9ps1S5JBnX5VskZSswXVQe55QIDAQAB',
+      'notify_url' => '',
+      'return_url' => '',
+      'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApIVSOQhGhke6xjf0yvd8dBTH34lrzdLnybz0mysN54Zq5r854hBFf2BNyoRG5HL+gUWT+nbB7cfzhsf/Co3cfAb6WLfYc4dKDqJQYNK/AZhxJD/yTXp41jTTRPqqYT9vkIh4Y0H2uOEeBehWql+wx+KOkhhgLFFsanyU0++pR8ZqzzhQI0T1SqNSmK9Y8FjW0+JjCIoYI8E5Kg2ngszBR/Y7bBfMwF8Vw62cisGS9LoHNqz2Q6904MjzZzWi9pxAukD8D8TyAUIh63Ya4UtUgALFcW8fc/zJwSA0asDtgzHwEvEOFcDZKmVVCkEAsS3k45nJXIvZ0Pzrzn/2+ipu5QIDAQAB',
       'private_key' => 'MIIEpQIBAAKCAQEAuWLcTZsd8mWDJ12rPJrog3/0o0toQqOxf8boG9WeVQ+aUyA7AD6j46xFJgdDlTVqMoOn2ywsaa6rnPtQ06rhSmTgGsLKCNHGfkP4FkAQNa/2LGHYhe4dQ/aek75KjzR4Gabnv0QtgMabIMUcM1c4bbQBo2dSHVL8FExFBLK1jiXIRhyFMA+llD2Ir341Q3Mls5DWuXoTmx+NXlcjwOuN2/u7zsSvCdxGWX8wkkY2is+IKMZ5ODUg72toSCMCr76exkWFlzp4b9WsXPtMei3XZpX4jQk6gy0gu8cAo3R7DpYMxIjNaP4YXOL6i/xTj9ps1S5JBnX5VskZSswXVQe55QIDAQABAoIBAGV3ZJjdU7C+OuCq9fQ/3Q9MU3uk5DXFHnuPRK8nZnesCI2C0Ig7wLv2KAq+YxEhoTRwtsjRDqXxQmCzdPPFTXXIbJh5ENdu6bNmRDz5Z2XbH2P/UeFMCJyQOQ8oUeq7jxiLL8CR8k3PZkyzVdIL5Qi2Q0dKX7lJGEuLyyLdJV3dA/e0eXTAX7XsihNeNh5maEkzmA/yS51MJM/nd9hl1TTAZpzJyuDwrM9jB88XWqM/URoedIIVZZI47KW1lGqYXwTYa8QV5ADAsXw/lXHjIMy9bvuoN9EqMSQ4NhfuOLvyueFG+Gt+Wwpaf0mmUL5htuGAXIK3AUoXl5K5uiJxIKkCgYEA9QLjpertX3IIyBbDa0p1z98zV/LvRwWh/K7f4EinyqQHRPBm7BIZtpgOztSdZYE6U6QG3cYzvbWEZ2Erq7ltpc1Yi9/Qjwp4zeUlxriuCp1Yb5/oQ9Xl75KJuPlFFFwkxGIjVwHVSPQYeJ5vqpSD9Ks9waDG5fFKW7wYioE4excCgYEAwbNh2624Dz+1SaAbbQ9wP5ursTGbbmTuz/092zNss9sXtfbmZHhiVGBV8DEygNQvW/1Sdyv+R0Q/TyHYBav8t55ON+AGaJ0KLexmeYqR1ksZ93RdN4bo/0zFel07qFdD+qKX+sKiazsh79liKg3yjuv7iKyVzAFqWHuNDDDk4GMCgYEAiTI2+3+TsDCQzkpA32FwmxgnDgaRCjoTPQVHg7Xrj0NOdsIPP/3avC5ljFfuUxqL6K4e0izcaEyueZ0l8SECTyevf5Oym4aHovO/tYlQm80D6m2mh+XMvdxWlmeu0PnP9M/nbh8uqY1V7qT5bpF/WpBRIo2/Ep+MvdWUAGrfj70CgYEAh9PGF0ml++tssIg5MyzURYZfyw1CNRNJ80ddjMxuuWA1LEBKJsHUEd7L5HZbN8OSwirNHQwYbtkIm/Dbjn6f5BJ6Puw1Ej6s2K8g3LGyulZHiyJqC3nrALtQ7xFZuB4ZaTOC5zB8vDzm+02wbFUDdf08kQaUtE15yTo6GgZfOIkCgYEAgv+VQZMX5cENxdUo2jw7FsNNo8jsK99iLkjri0R4wpP6x2OFZKBe0oqXN+bIGXRhAEU8F11uD1l+nnZhnRjB3P6vB16JNn691DjQf0R4SNECQcVU+BDb2DHG9PywwYcIM2x0idvd2QEYMLukJ0CPk5k5cIjzHE0mgblN2ktnhVg=',
       'log' => '1',
     ),

addons/epay/library/Yansongda/Pay/Gateways/Alipay/Alipay.php

@@ -162,7 +162,6 @@ abstract class Alipay implements GatewayInterface
                 "\n-----END PUBLIC KEY-----";
 
         $toVerify = $sync ? json_encode($data) : $this->getSignContent($data, true);
-
         return openssl_verify($toVerify, base64_decode($sign), $res, OPENSSL_ALGO_SHA256) === 1 ? $data : false;
     }
 

addons/unishop/controller/Pay.php

@@ -75,6 +75,12 @@ class Pay extends Base
                 $this->error(__('Order does not exist'));
             }
 
+            $products = $order->products()->select();
+
+            $body = Config::getByName('name')['value'];
+            foreach ($products as $product) {
+                $body .= '_' . $product['title'];
+            }
             //MWEB
             $platfrom = $this->request->header('platform', 'MP-WEIXIN');
 
@@ -87,55 +93,20 @@ class Pay extends Base
                     $trade_type = 'MWEB';
                     break;
             }
-
             // 如果是微信内访问 公众号等
             if (Wechat::h5InWechat()) {
-                $trade_type = 'JSAPI';
-            }
-
-            $products = $order->products()->select();
-
-            $body = Config::getByName('name')['value'];
-            foreach ($products as $product) {
-                $body .= '_' . $product['title'];
-            }
-
-            $app = Wechat::initEasyWechat('payment');
-            $result = $app->order->unify([
-                'body' => $body,
-                'out_trade_no' => $order['out_trade_no'],
-                'total_fee' => bcmul($order['total_price'], 100),
-                'spbill_create_ip' => $_SERVER['REMOTE_ADDR'], // 可选，如不传该参数，SDK 将会自动获取相应 IP 地址
-                'trade_type' => $trade_type, // 请对应换成你的支付方式对应的值类型
-                'openid' => Wechat::getOpenidByUserId($this->auth->id)
-            ]);
-
-            if ($result['return_code'] == 'SUCCESS' && $result['result_code'] == 'SUCCESS') {
-
-                if ($trade_type == 'JSAPI') {
-                    // 二次签名
-                    $result['timeStamp'] = (string)time();
-                    $result['paySign'] = Wechat::paySign([
-                        'appId' => Config::getByName('app_id')['value'],
-                        'nonceStr' => $result['nonce_str'],
-                        'package' => 'prepay_id=' . $result['prepay_id'],
-                        'timeStamp' => $result['timeStamp'],
-                        'signType' => 'MD5'
-                    ], Config::getByName('key')['value']);
-                } elseif ($trade_type == 'MWEB') {
-                    $page = '/pages/order/order?state=0';
-                    if ($platfrom == 'APP-PLUS') {
-                        $page = '/pages/index/index';
-                    }
-                    $result['mweb_url'] .= '&redirect_url=' . urlencode('https://' . $_SERVER['HTTP_HOST'] . '/h5/#' . $page);
-                    $result['referer'] = 'https://' . $_SERVER['HTTP_HOST'];
-                }
-
-                $this->success('', $result);
-            } else {
-                $this->error($result['return_msg']);
+                $trade_type = 'wap';
             }
+            $params = [
+                'amount' => bcmul($order['total_price'], 100),
+                'orderid' => $order->out_trade_no,
+                'type' => "wechat",
+                'title' => $body,
+                'notifyurl' => Config::getByName('notify_url')['value'],
+                'trade_type' => $trade_type,
 
+            ];
+            return Service::submitOrder($params);
         } catch (Exception $e) {
             $this->error($e->getMessage());
         }

addons/unishop/uniapp/uni-shop/main.js

@@ -3,7 +3,7 @@ import store from './store'
 import App from './App'
 
 // 后端api地址
-Vue.prototype.$unishow = "http://nwx.zhizhuchuxing.cn/addons/unishop";
+Vue.prototype.$unishow = "http://127.0.0.1/addons/unishop";
 // Vue.prototype.$unishow = "http://shop1.com/index.php/addons/unishop";
 //Vue.prototype.$unishow = "http://t.fastadmin-ceshi.com:8888/addons/unishop";
 //Vue.prototype.$unishow = "http://shop.weivee.com/addons/unishop";
@@ -13,7 +13,7 @@ uni.getSystemInfo({
 	success(res) {
 		//console.log(res)
 		if (res.platform != "devtools") {
-			Vue.prototype.$unishow = "http://nwx.zhizhuchuxing.cn/addons/unishop";
+			Vue.prototype.$unishow = "http://127.0.0.1/addons/unishop";
 			// Vue.prototype.$unishow = "http://shop1.com/index.php/addons/unishop";
 		}
 	}

addons/unishop/uniapp/uni-shop/pages.json

@@ -63,13 +63,15 @@
 			"style": {
 				"navigationBarTitleText": "修改资料"
 			}
-		}, {
-			"path": "pages/cart/cart",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "购物车"
-			}
-		}, {
+		}, 
+		// {
+		// 	"path": "pages/cart/cart",
+		// 	"style": {
+		// 		"enablePullDownRefresh": true,
+		// 		"navigationBarTitleText": "购物车"
+		// 	}
+		// },
+		{
 			"path": "pages/public/login",
 			"style": {
 				"navigationBarTitleText": "",
@@ -199,7 +201,7 @@
 		    "path" : "pages/flash/list",
 		    "style" : {
 				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "限时秒杀"
+				"navigationBarTitleText": "限时活动"
 			}
 		},
 		{
@@ -230,13 +232,13 @@
 				"navigationBarTitleText": "申请售后"
 			}
 		},
-		{
-		    "path" : "pages/product/evaluate",
-		    "style" : {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "评价"
-			}
-		},
+		// {
+		//     "path" : "pages/product/evaluate",
+		//     "style" : {
+		// 		"enablePullDownRefresh": true,
+		// 		"navigationBarTitleText": "评价"
+		// 	}
+		// },
 		{
 		    "path" : "pages/order/delivery",
 		    "style" : {
@@ -268,12 +270,12 @@
 				"selectedIconPath": "static/tab-cate-current.png",
 				"text": "分类"
 			},
-			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tab-cart.png",
-				"selectedIconPath": "static/tab-cart-current.png",
-				"text": "购物车"
-			},
+			// {
+			// 	"pagePath": "pages/cart/cart",
+			// 	"iconPath": "static/tab-cart.png",
+			// 	"selectedIconPath": "static/tab-cart-current.png",
+			// 	"text": "购物车"
+			// },
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tab-my.png",

addons/unishop/uniapp/uni-shop/pages/flash/list.vue

@@ -170,7 +170,7 @@
 			// 设置导航栏名称
 			setNavigationBarTitle(title) {
 				uni.setNavigationBarTitle({
-					title: '限时秒杀|' + title
+					title: '限时活动|' + title
 				});
 			}
 

addons/unishop/uniapp/uni-shop/pages/money/pay.vue

@@ -26,7 +26,7 @@
 					</radio>
 				</label>
 			</view>
-			<view class="type-item b-b" @click="changePayType(3)" v-if="payTypeList.offline">
+			<!-- <view class="type-item b-b" @click="changePayType(3)" v-if="payTypeList.offline">
 				<text class="icon yticon icon-pay"></text>
 				<view class="con">
 					<text class="tit">货到付款</text>
@@ -35,7 +35,7 @@
 					<radio value="" color="#fa436a" :checked='payType == 3' />
 					</radio>
 				</label>
-			</view>
+			</view> -->
 		</view>
 
 		<text class="mix-btn" @click="confirm">确认支付</text>
@@ -85,8 +85,8 @@
 					case 2: // 支付宝支付
 
 						break;
-					case 3: // 货到付款
-						break;
+					// case 3: // 货到付款
+					// 	break;
 				}
 			},
 			//确认支付
@@ -99,10 +99,11 @@
 				} else if (this.payType == 2) {
 					// 支付宝支付
 					this.alipay();
-				} else if (this.payType == 3) {
-					// 货到付款
-					this.offlinePay();
 				}
+				//  else if (this.payType == 3) {
+				// 	// 货到付款
+				// 	this.offlinePay();
+				// }
 			},
 			async alipay() {
 				

addons/unishop/uniapp/uni-shop/pages/order/order.vue

@@ -29,7 +29,7 @@
 								<text class="title clamp">{{goodsItem.title}}</text>
 								<text class="attr-box">{{goodsItem.spec}} x {{goodsItem.number}}</text>
 								<text class="price">{{goodsItem.price}}</text>
-								<button class="action-btn" v-if="item.have_received != 0 && goodsItem.evaluate == false && goodsItem.refund==false" @click.stop="button('evaluate', {order_id:item.order_id,id:goodsItem.id,image:goodsItem.image,title:goodsItem.title,spec:goodsItem.spec})">评价</button>
+								<!-- <button class="action-btn" v-if="item.have_received != 0 && goodsItem.evaluate == false && goodsItem.refund==false" @click.stop="button('evaluate', {order_id:item.order_id,id:goodsItem.id,image:goodsItem.image,title:goodsItem.title,spec:goodsItem.spec})">评价</button> -->
 							</view>
 						</view>
 
@@ -47,13 +47,13 @@
 							<button class="action-btn recom" v-if="item.have_paid == 0" @click.stop="button('pay',item)">立即支付</button>
 							<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_delivered == 0">提醒发货</button> -->
 							<!-- <button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('delivery',item)">查看物流</button> -->
-							<button class="action-btn" v-if="item.have_paid != 0 && item.have_received == 0" @click.stop="button('recerved',item)">确认收货</button>
+							<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_received == 0" @click.stop="button('recerved',item)">确认收货</button> -->
 							<!-- <button class="action-btn" v-if="item.have_received != 0 && item.have_commented != 0">追加评价</button> -->
-							<button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('refund', item)">申请售后</button>
+							<!-- <button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('refund', item)">申请售后</button> -->
 						</view>
-						<view class="action-box b-t" v-if="item.state == 9 && item.status == -1">
+<!-- 						<view class="action-box b-t" v-if="item.state == 9 && item.status == -1">
 							<button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('refund', item)">查看售后</button>
-						</view>
+						</view> -->
 					</view>
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
@@ -103,14 +103,14 @@
 					},
 					{
 						state: 4,
-						text: '评价',
+						text: '已完成',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 5,
-						text: '售后',
+						text: '已取消',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
@@ -308,7 +308,7 @@
 						stateTip = '待评价';
 						break;
 					case 5:
-						stateTip = '售后';
+						stateTip = '已取消';
 						break;
 					case 6:
 						stateTip = '拒绝退款';
@@ -391,14 +391,14 @@
 					},
 					{
 						state: 4,
-						text: '评价',
+						text: '已完成',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 5,
-						text: '售后',
+						text: '已取消',
 						loadingType: 'more',
 						orderList: [],
 						page: 1

addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue

@@ -31,7 +31,7 @@
 					<text class="title clamp">{{goodsItem.title}}</text>
 					<text class="attr-box">{{goodsItem.spec}} x {{goodsItem.number}}</text>
 					<text class="price">{{goodsItem.price}}</text>
-					<button class="action-btn" v-if="order.have_received != 0 && goodsItem.evaluate == false" @click.stop="button('evaluate', goodsItem)">评价</button>
+					<!-- <button class="action-btn" v-if="order.have_received != 0 && goodsItem.evaluate == false" @click.stop="button('evaluate', goodsItem)">评价</button> -->
 				</view>
 			</view>
 
@@ -59,11 +59,11 @@
 			<button class="action-btn recom" v-if="order.have_paid == 0" @click.stop="button('pay')">立即支付</button>
 			<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('delivery')">查看物流</button> -->
 			<button class="action-btn" v-if="order.have_paid != 0 && order.have_received == 0" @click.stop="button('recerved')">确认收货</button>
-			<button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">申请售后</button>
+			<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">申请售后</button> -->
 		</view>
-		<view class="bottom" v-if="order.state == 9 && order.status == -1">
+		<!-- <view class="bottom" v-if="order.state == 9 && order.status == -1">
 			<button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">查看售后</button>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -107,9 +107,9 @@
 					case 3:
 						stateTip = '待收货';
 						break;
-					case 4:
-						stateTip = '待评价';
-						break;
+					// case 4:
+					// 	stateTip = '待评价';
+					// 	break;
 					case 5:
 						stateTip = '售后';
 						break;

addons/unishop/uniapp/uni-shop/pages/public/login.vue

@@ -12,8 +12,8 @@
 
 			<view class="input-content">
 				<view class="input-item">
-					<text class="tit">手机号码</text>
-					<input type="text" :value="mobile" placeholder="请输入手机号码" data-key="mobile" @input="inputChange" />
+					<text class="tit">工号</text>
+					<input type="text" :value="mobile" placeholder="请输入工号" data-key="mobile" @input="inputChange" />
 				</view>
 				<view class="input-item">
 					<text class="tit">密码</text>
@@ -23,13 +23,13 @@
 			</view>
 			<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
 			<!-- #ifdef MP-WEIXIN -->
-			<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="loginForWechatMini">授权微信绑定电话号码一键登录</button>
+			<!-- <button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="loginForWechatMini">授权微信绑定电话号码一键登录</button> -->
 			<!-- #endif -->
 
-			<view class="forget-section">
-				<view><label @click="register('resetpwd')">忘记密码</label>
+			<!-- <view class="forget-section"> -->
+				<!-- <view><label @click="register('resetpwd')">忘记密码</label> -->
 					<!-- - <label @click="register('register')">立马注册</label></view> -->
-				</view>
+				<!-- </view> -->
 
 
 			</view>

addons/unishop/uniapp/uni-shop/pages/set/set.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="list-cell b-b m-t" @click="navTo('/pages/userinfo/userinfo')" hover-class="cell-hover" :hover-stay-time="50">
-			<text class="cell-tit">个人资料</text>
+			<text class="cell-tit">修改密码</text>
 			<text class="cell-more yticon icon-you"></text>
 		</view>
 		<view class="list-cell log-out-btn" @click="toLogout">

addons/unishop/uniapp/uni-shop/pages/user/user.vue

@@ -63,12 +63,12 @@
 				<view class="order-item" @click="$api.navTo('/pages/order/order?state=4')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-pingjia"></text>
 					<text class="num" v-if="orderNum.uncomment > 0">{{orderNum.uncomment}}</text>
-					<text>评价</text>
+					<text>已完成</text>
 				</view>
 				<view class="order-item" @click="$api.navTo('/pages/order/order?state=5')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-shouhou"></text>
 					<text class="num" v-if="orderNum.refund > 0">{{orderNum.refund}}</text>
-					<text>退款/售后</text>
+					<text>已取消</text>
 				</view>
 			</view>
 			<!-- 浏览历史 -->
@@ -86,7 +86,7 @@
 					<image @click="navTo('/pages/product/product')" src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=191678693,2701202375&fm=26&gp=0.jpg" mode="aspectFill"></image>
 				</scroll-view> -->
 				<!-- <list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的钱包" tips="您的会员还有3天过期"></list-cell> -->
-				<list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @eventClick="$api.navTo('/pages/address/address')"></list-cell>
+				<!-- <list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @eventClick="$api.navTo('/pages/address/address')"></list-cell> -->
 				<!-- <list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="邀请好友赢10万大礼"></list-cell> -->
 				<!-- <list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="晒单" tips="晒单抢红包"></list-cell> -->
 				<list-cell icon="icon-shoucang-setting" iconColor="#54b4ef" title="我的收藏" @eventClick="$api.navTo('/pages/favorite/favorite')"></list-cell>

addons/unishop/uniapp/uni-shop/pages/userinfo/userinfo.vue

@@ -18,9 +18,9 @@
 			</view>
 		</view>
 		<view class="yt-list-cell">
-			<view class="cell-tit clamp">手机号码
+			<view class="cell-tit clamp">登陆密码
 				<input v-if="mobile" disabled="true" class="input" type="text" v-model="mobile" />
-				<button v-else class="input" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权获取微信绑定的手机号码</button>
+				<!-- <button v-else class="input" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权获取微信绑定的手机号码</button> -->
 			</view>
 		</view>
 		<!-- #endif -->