名称替换

picnicode · Nov 10, 2021 · f0e5243 · f0e5243
1 parent b0465a8
commit f0e5243
Show file tree

Hide file tree

Showing 475 changed files with 1,941 additions and 1,313 deletions.
diff --git a/README.md b/README.md
@@ -31,21 +31,19 @@ vue后台前端：https://gitee.com/gz-yami/mall4v
 
 小程序：https://gitee.com/gz-yami/mall4m
 
-uniapp端：https://gitee.com/gz-yami/mall4uni
-
+uni-app：https://gitee.com/gz-yami/mall4uni
 
 
 ## 演示地址
 
  **由于我们并不希望小程序的数据被弄混乱，我们弄了两个数据库。因此，您修改了后台的商品信息，小程序并不能看到！** 
 
-后台：<http://mall4j-admin.gz-yami.com>  账号：admin/123456
+后台：<http://mall4j-admin.mall4j.com>  账号：admin/123456
 
-小程序：1. 扫描二维码
+小程序：扫描二维码
 
 ![小程序](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/miniQrcode.jpg)
 
-		2. 搜索小程序 **亚米商城** 
 
 ## 技术选型
 
@@ -81,44 +79,38 @@ https://gitee.com/gz-yami/mall4j/wikis
 
 
 ### 1. 后台截图
+![输入图片说明](https://images.gitee.com/uploads/images/2021/1110/143738_88a8a1e6_5094767.gif "后台.gif")
 
-![登陆](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/login.png)
-
-![订单](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/order.png)
-
-![商品列表](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/prodList.png)
-
-![sku](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/sku.png)
 
-![运费模板](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/transport.png)
 
 
+### 2. 移动端截图
 
-### 2. 小程序截图
+![输入图片说明](https://images.gitee.com/uploads/images/2021/1110/145209_2ec1ad04_5094767.png "开源移动端截图.png")
 
-![小程序截图](https://images.gitee.com/uploads/images/2019/0706/085234_4eb7509b_5094767.jpeg "小程序截图")
 
+### 3. 软著截图
+![输入图片说明](https://images.gitee.com/uploads/images/2021/0703/110940_a9b72c43_5094767.png "Mall4j商城系统V1.0.png")
 
 
-### 3. uni-app截图
 
-![uni-app模板](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/uniappInfo.png)
+## 提交反馈
+- Mall4j官网 https://www.mall4j.com
 
 
+- mall4j开源技术QQ群：722835385
 
-## 提交反馈
+![输入图片说明](https://images.gitee.com/uploads/images/2021/0703/110919_835cf484_5094767.jpeg "mall4j群.jpg")
 
-- QQ群：722835385
 
-  ![输入图片说明](https://images.gitee.com/uploads/images/2019/0723/094927_e686539d_5094767.jpeg "微信图片_20190723091006.jpg")
+## 特别鸣谢
 
+- wxjava:https://github.com/Wechat-Group/WxJava
 
-## 后续会加入微服务框架、分布式版本
+## mall4cloud微服务版本已上线
+https://gitee.com/gz-yami/mall4cloud
 
 ## 你的点赞鼓励，是我们前进的动力~
 ## 你的点赞鼓励，是我们前进的动力~
 ## 你的点赞鼓励，是我们前进的动力~
 
-
-
-![软著截图](https://images.gitee.com/uploads/images/2020/0515/200917_995e6632_1613814.png "软著.png")
diff --git a/db/yami_shop.sql b/db/yami_shop.sql
@@ -4787,9 +4787,9 @@ CREATE TABLE `tz_shop_detail` (
 /*Data for the table `tz_shop_detail` */
 
 insert  into `tz_shop_detail`(`shop_id`,`shop_name`,`user_id`,`shop_type`,`intro`,`shop_notice`,`shop_industry`,`shop_owner`,`mobile`,`tel`,`shop_lat`,`shop_lng`,`shop_address`,`province`,`city`,`area`,`pca_code`,`shop_logo`,`shop_photos`,`open_time`,`shop_status`,`transport_type`,`fixed_freight`,`full_free_shipping`,`create_time`,`update_time`,`is_distribution`) values
-(1,'亚米小店1',NULL,NULL,'亚米小店 爱你哟',NULL,NULL,NULL,NULL,'020-123456',NULL,NULL,'大学城北','广东省','广州市','番禺区','44/4401/440113','2018/08/78a6a63cf02d4965912bc5047f49afa0.jpg','2018/08/c7a50f443a85462d8129d83cf0f7eb91.jpg,2018/08/79791fc749444ef1ab4d2ca56fe9363f.jpg','00:00:00 - 00:20:00',1,NULL,NULL,NULL,'2018-08-30 11:10:05',NULL,1),
-(2,'亚米大店2',NULL,NULL,'亚米大店 店大大',NULL,NULL,NULL,NULL,'010-123456',NULL,NULL,'天安门哟','北京市','市辖区','东城区','11/1101/110101','2018/08/0907446e05c44431be5d27ec7c277ee6.jpg','2018/08/5f97fc62c18d4d2292f8101fa0291e85.jpg','06:00:00 - 00:00:00',1,NULL,NULL,NULL,'2018-08-31 10:16:06',NULL,NULL),
-(3,'亚米3',NULL,NULL,'亚米 店铺描述',NULL,NULL,NULL,NULL,'010-211111111',NULL,NULL,'大学城北','天津市','市辖区','和平区','12/1201/120101','2018/09/4bb8b326f85a4c6aad251c561a17f0c4.png','2018/09/63c3d47beb5544f9b30103721002ca2e.jpg,2018/09/899e1ebf3c6c467d8d8630a3c18720db.jpg','00:02:00 - 00:00:00',1,NULL,NULL,NULL,'2018-09-06 18:50:00','2018-09-29 09:50:05',NULL);
+(1,'mall4j小店1',NULL,NULL,'mall4j小店 爱你哟',NULL,NULL,NULL,NULL,'020-123456',NULL,NULL,'大学城北','广东省','广州市','番禺区','44/4401/440113','2018/08/78a6a63cf02d4965912bc5047f49afa0.jpg','2018/08/c7a50f443a85462d8129d83cf0f7eb91.jpg,2018/08/79791fc749444ef1ab4d2ca56fe9363f.jpg','00:00:00 - 00:20:00',1,NULL,NULL,NULL,'2018-08-30 11:10:05',NULL,1),
+(2,'mall4j大店2',NULL,NULL,'mall4j大店 店大大',NULL,NULL,NULL,NULL,'010-123456',NULL,NULL,'天安门哟','北京市','市辖区','东城区','11/1101/110101','2018/08/0907446e05c44431be5d27ec7c277ee6.jpg','2018/08/5f97fc62c18d4d2292f8101fa0291e85.jpg','06:00:00 - 00:00:00',1,NULL,NULL,NULL,'2018-08-31 10:16:06',NULL,NULL),
+(3,'mall4j3',NULL,NULL,'mall4j 店铺描述',NULL,NULL,NULL,NULL,'010-211111111',NULL,NULL,'大学城北','天津市','市辖区','和平区','12/1201/120101','2018/09/4bb8b326f85a4c6aad251c561a17f0c4.png','2018/09/63c3d47beb5544f9b30103721002ca2e.jpg,2018/09/899e1ebf3c6c467d8d8630a3c18720db.jpg','00:02:00 - 00:00:00',1,NULL,NULL,NULL,'2018-09-06 18:50:00','2018-09-29 09:50:05',NULL);
 
 /*Table structure for table `tz_sku` */
 

diff --git a/doc/商城表设计/商品分组.md b/doc/商城表设计/商品分组.md
@@ -2,7 +2,7 @@
 
 #### 商城应用
 
-在亚米精选商城首页中，可以看到有`每日上新`、`商城热卖`、`更多商品`等标签栏，在每一栏位中用来展示特定的商品列表，如下图：。
+在mall4j精选商城首页中，可以看到有`每日上新`、`商城热卖`、`更多商品`等标签栏，在每一栏位中用来展示特定的商品列表，如下图：。
 
 ![1566266497255](.\img\小程序-分组商品.png)
 

diff --git a/doc/基本框架设计/Swagger文档.md b/doc/基本框架设计/Swagger文档.md
@@ -50,10 +50,10 @@ public class SwaggerConfiguration {
      @Bean
      public ApiInfo apiInfo() {
          return new ApiInfoBuilder()
-         .title("亚米商城接口文档")
-         .description("亚米商城接口文档Swagger版")
+         .title("mall4j商城接口文档")
+         .description("mall4j商城接口文档Swagger版")
          .termsOfServiceUrl("http://www.gz-yami.com/")
-         .contact(new Contact("广州亚米信息科技有限公司","https://www.gz-yami.com/", ""))
+         .contact(new Contact("广州市蓝海创新科技有限公司","https://www.mall4j.com/", ""))
          .version("1.0")
          .build();
      }

diff --git a/mall4m/pages/basket/basket.js b/mall4m/pages/basket/basket.js
@@ -14,7 +14,7 @@ Page({
     finalMoney: 0,
     totalMoney: 0,
     subtractMoney: 0,
-    allChecked: true
+    allChecked: false
   },
 
   /**
@@ -35,41 +35,42 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    wx.showLoading();
-    //加载购物车
-    var params = {
-      url: "/p/shopCart/info",
-      method: "POST",
-      data: {},
-      callBack: res => {
-        if (res.length > 0) {
-          // 默认全选
-          var shopCartItemDiscounts = res[0].shopCartItemDiscounts;
-          shopCartItemDiscounts.forEach(shopCartItemDiscount => {
-            shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
-              shopCartItem.checked = true;
-            })
-          })
-
-          this.setData({
-            shopCartItemDiscounts: shopCartItemDiscounts,
-            allChecked: true
-          });
-
-        } else {
-          this.setData({
-            shopCartItemDiscounts: [],
-          });
-        }
-        this.calTotalPrice();//计算总价
-        wx.hideLoading();
-      }
-    };
-    http.request(params);
-
+	this.loadBasketData();
     http.getCartCount();//重新计算购物车总数量
-
   },
+  loadBasketData(){
+			wx.showLoading(); //加载购物车
+
+			var params = {
+			  url: "/p/shopCart/info",
+			  method: "POST",
+			  data: {},
+			  callBack: res => {
+			    if (res.length > 0) {
+			      // 默认不选中
+			      var shopCartItemDiscounts = res[0].shopCartItemDiscounts;
+			      shopCartItemDiscounts.forEach(shopCartItemDiscount => {
+			        shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
+			          shopCartItem.checked = false;
+			        });
+			      });
+			      this.setData({
+			        shopCartItemDiscounts: shopCartItemDiscounts,
+			        allChecked: false
+			      });
+			    } else {
+			      this.setData({
+			        shopCartItemDiscounts: []
+			      });
+			    }
+
+			    this.calTotalPrice(); //计算总价
+
+			    wx.hideLoading();
+			  }
+			};
+			http.request(params);
+		},
 
   /**
    * 去结算
@@ -290,7 +291,7 @@ Page({
               data: basketIds,
               callBack: function (res) {
                 wx.hideLoading();
-                ths.onShow();
+                ths.loadBasketData();
               }
             };
             http.request(params);

diff --git a/mall4m/pages/binding-phone/binding-phone.js b/mall4m/pages/binding-phone/binding-phone.js
@@ -106,7 +106,7 @@ Page({
       url: '/user/registerOrBindUser',
       method: 'PUT',
       data: {
-        appType: 1,  // 微信小程序
+        appType: 1, // 微信小程序
         mobile: this.data.phonenum,
         validCode: this.data.code,
         validateType: 1, // 验证类型:1验证码验证 ,

diff --git a/mall4m/pages/login/login.js b/mall4m/pages/login/login.js
@@ -9,12 +9,12 @@ Page({
   },
 
   onGotUserInfo: function (res) {
-
     http.updateUserInfo();
     wx.navigateBack({
       delta: 1
     })
   },
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -70,4 +70,4 @@ Page({
   onShareAppMessage: function () {
 
   }
-})
+})
diff --git a/mall4m/pages/order-detail/order-detail.wxml b/mall4m/pages/order-detail/order-detail.wxml
@@ -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' wx:if="{{item.status!=1}}">申请售后</text>
+                <text class='btn'>申请售后</text>
                 <text class='btn'>加购物车</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'>申请售后</text>
+              <text class='btn' wx:if="{{item.status!=1}}">申请售后</text>
               <text class='btn'>加购物车</text>
             </view>
           </view>
@@ -156,4 +156,4 @@
 
   </view>
 </view>
-<wxs module="wxs" src="../../wxs/number.wxs" />
+<wxs module="wxs" src="../../wxs/number.wxs" />
diff --git a/mall4m/pages/prod-classify/prod-classify.wxml b/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='tit-background'></view>
+  <!-- <view class='line-fix'></view> -->
+  <!-- <view class='tit-background'></view> -->
   <view>
     <block wx:for="{{prodList}}" wx:key ="key">
       <prod item="{{item}}" ></prod>

diff --git a/mall4m/pages/prod-classify/prod-classify.wxss b/mall4m/pages/prod-classify/prod-classify.wxss
@@ -23,4 +23,4 @@ page {
   color: #999;
   text-align: center;
   margin: 100rpx 0;
-}
+}
diff --git a/mall4m/pages/search-page/search-page.js b/mall4m/pages/search-page/search-page.js
@@ -100,7 +100,7 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-	this.prodName = ''
+
   },
 
   /**

diff --git a/mall4m/pages/user/user.wxml b/mall4m/pages/user/user.wxml
@@ -56,11 +56,11 @@
         <view class="tit">我的收藏</view>
       </view>
       <view class="col-item">
-        <view class="num">5</view>
+        <view class="num">0</view>
         <view class="tit">我的消息</view>
       </view>
       <view class="col-item">
-        <view class="num">3</view>
+        <view class="num">0</view>
         <view class="tit">我的足迹</view>
       </view>
     </view>

diff --git a/mall4uni/pages.json b/mall4uni/pages.json
@@ -4,7 +4,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"backgroundTextStyle": "dark",
-				"navigationBarBackgroundColor": "white",
+				"navigationBarBackgroundColor": "#fff",
 				"navigationBarTextStyle": "black",
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "mall4j"

diff --git a/mall4uni/pages/basket/basket.vue b/mall4uni/pages/basket/basket.vue
@@ -150,11 +150,11 @@ export default {
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-	this.loadBasketData();
+    this.loadBasketData();
     http.getCartCount(); //重新计算购物车总数量
   },
   methods: {
-	loadBasketData(){
+    loadBasketData(){
 			uni.showLoading(); //加载购物车
 			
 			var params = {

diff --git a/mall4uni/pages/delivery-address/delivery-address.vue b/mall4uni/pages/delivery-address/delivery-address.vue
@@ -109,7 +109,7 @@ export default {
       };
       http.request(params);
     },
-    // 修改地址 
+    // 修改地址
     toEditAddress: function (e) {
       var addrId = e.currentTarget.dataset.addrid;
       uni.navigateTo({
@@ -125,7 +125,6 @@ export default {
         var pages = getCurrentPages(); //当前页面
 
         var prevPage = pages[pages.length - 2]; //上一页面
-
         //直接给上一页面赋值
         prevPage.item = item
         prevPage.selAddress = 'yes'
@@ -140,4 +139,4 @@ export default {
 </script>
 <style>
 @import "./delivery-address.css";
-</style>
+</style>
diff --git a/mall4uni/pages/editAddress/editAddress.vue b/mall4uni/pages/editAddress/editAddress.vue
@@ -356,7 +356,7 @@ export default {
       var addr = ths.addr;
 
       if (!receiver.trim()) {
-        ths.receiver = ''
+        this.receiver = ''
         uni.showToast({
           title: '请输入收货人姓名',
           icon: "none"
@@ -381,7 +381,7 @@ export default {
       }
 
       if (!addr.trim()) {
-        ths.receiver = ''
+        this.addr = ''
         uni.showToast({
           title: '请输入详细地址',
           icon: "none"
@@ -475,4 +475,4 @@ export default {
 </script>
 <style>
 @import "./editAddress.css";
-</style>
+</style>
diff --git a/mall4uni/pages/news-detail/news-detail.css b/mall4uni/pages/news-detail/news-detail.css
@@ -23,4 +23,4 @@
   display: block;
   width: 100%;
   height: auto;
-}
+}
diff --git a/mall4uni/pages/prod-classify/prod-classify.css b/mall4uni/pages/prod-classify/prod-classify.css
@@ -30,4 +30,4 @@ page {
   color: #999;
   margin-top: 20vh;
   text-align: center;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ Page({ @@
        * 生命周期函数--监听页面隐藏
        */
       onHide: function () {
-    	this.prodName = ''
       },
       /**
@@ Expand Down @@