开发

mallApp/dist/build/mp-weixin/components/app-delivery.wxss

@@ -1 +1 @@
-.app-delivery-module .module-com.data-v-2c00c399{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .module-com .module-tit.data-v-2c00c399{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-delivery-module .module-com .module-det.data-v-2c00c399{padding:0 30rpx}.app-delivery-module .line-cell .tui-title.data-v-2c00c399{width:210rpx;color:#666}.app-delivery-module .line-cell .tui-input.data-v-2c00c399{width:calc(100% - 210rpx);font-size:28rpx}.app-delivery-module .line-cell .tui-placeholder.data-v-2c00c399{color:#ccc}.app-delivery-module .line-cell .phcolor.data-v-2c00c399{color:green}.app-delivery-module .delivery-time.data-v-2c00c399{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#fff;padding:20rpx 0}.app-delivery-module .delivery-time .button-com.data-v-2c00c399{padding-top:14rpx;padding-bottom:10rpx;margin:0 10rpx}.app-delivery-module .gift-wrap .gift-content.data-v-2c00c399{width:100%}.app-delivery-module .gift-wrap .need-gift.data-v-2c00c399{margin-left:14rpx;color:#666}.app-delivery-module .gift-wrap .gitf-textarea.data-v-2c00c399{margin-top:40rpx}.app-delivery-module .none-name-delivery.data-v-2c00c399{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .none-name-delivery .none-name-text.data-v-2c00c399{margin-left:14rpx;color:#666}
+.app-delivery-module .module-com.data-v-2b5b86fa{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .module-com .module-tit.data-v-2b5b86fa{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-delivery-module .module-com .module-det.data-v-2b5b86fa{padding:0 30rpx}.app-delivery-module .line-cell .tui-title.data-v-2b5b86fa{width:210rpx;color:#666}.app-delivery-module .line-cell .tui-input.data-v-2b5b86fa{width:calc(100% - 210rpx);font-size:28rpx}.app-delivery-module .line-cell .tui-placeholder.data-v-2b5b86fa{color:#ccc}.app-delivery-module .line-cell .phcolor.data-v-2b5b86fa{color:green}.app-delivery-module .delivery-time.data-v-2b5b86fa{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#fff;padding:20rpx 0}.app-delivery-module .delivery-time .button-com.data-v-2b5b86fa{padding-top:14rpx;padding-bottom:10rpx;margin:0 10rpx}.app-delivery-module .gift-wrap .gift-content.data-v-2b5b86fa{width:100%}.app-delivery-module .gift-wrap .need-gift.data-v-2b5b86fa{margin-left:14rpx;color:#666}.app-delivery-module .gift-wrap .gitf-textarea.data-v-2b5b86fa{margin-top:40rpx}.app-delivery-module .none-name-delivery.data-v-2b5b86fa{margin-bottom:20rpx;background-color:#fff}.app-delivery-module .none-name-delivery .none-name-text.data-v-2b5b86fa{margin-left:14rpx;color:#666}

mallApp/dist/build/mp-weixin/components/module/app-order-list.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-order-list"],{6051:function(t,n,i){"use strict";var e=i("c5ec"),o=i.n(e);o.a},"6dbf":function(t,n,i){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={name:"list-module",props:{info:{type:Object,default:function(){}},goodsStyleId:""},data:function(){return{}},computed:{imgUrl:function(){var t=this;if(this.$util.isEmpty(this.info))return"";var n="";return this.info.goodsStyleList.forEach((function(i){i.id==t.goodsStyleId&&(console.log(i.img),n=i.img)})),this.$util.isEmpty(n)?this.info.smallCoverUrl?this.info.smallCoverUrl:this.info.smallImgList[0]:n}},mounted:function(){},methods:{}};n.default=e},"7d55":function(t,n,i){"use strict";i.r(n);var e=i("c2b8"),o=i("c41b");for(var u in o)["default"].indexOf(u)<0&&function(t){i.d(n,t,(function(){return o[t]}))}(u);i("6051");var r,f=i("0095"),c=Object(f["a"])(o["default"],e["b"],e["c"],!1,null,"f0b99eae",null,!1,e["a"],r);n["default"]=c.exports},c2b8:function(t,n,i){"use strict";var e;i.d(n,"b",(function(){return o})),i.d(n,"c",(function(){return u})),i.d(n,"a",(function(){return e}));var o=function(){var t=this,n=t.$createElement,i=(t._self._c,t.$util.isEmpty(t.info)),e=i?null:t._f("default_img")(t.imgUrl);t.$mp.data=Object.assign({},{$root:{g0:i,f0:e}})},u=[]},c41b:function(t,n,i){"use strict";i.r(n);var e=i("6dbf"),o=i.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){i.d(n,t,(function(){return e[t]}))}(u);n["default"]=o.a},c5ec:function(t,n,i){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-order-list"],{"655e":function(t,n,i){},"6a0d":function(t,n,i){"use strict";var e;i.d(n,"b",(function(){return o})),i.d(n,"c",(function(){return u})),i.d(n,"a",(function(){return e}));var o=function(){var t=this,n=t.$createElement,i=(t._self._c,t.$util.isEmpty(t.info)),e=i?null:t._f("default_img")(t.imgUrl);t.$mp.data=Object.assign({},{$root:{g0:i,f0:e}})},u=[]},"6dbf":function(t,n,i){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={name:"list-module",props:{info:{type:Object,default:function(){}},goodsStyleId:""},data:function(){return{}},computed:{imgUrl:function(){var t=this;if(this.$util.isEmpty(this.info))return"";var n="";return this.$util.isEmpty(this.info.goodsStyleList)||(this.info.goodsStyleList.forEach((function(i){i.id==t.goodsStyleId&&(n=i.img)})),this.$util.isEmpty(n))?this.info.smallCoverUrl?this.info.smallCoverUrl:void 0:n}},mounted:function(){},methods:{}};n.default=e},"7d55":function(t,n,i){"use strict";i.r(n);var e=i("6a0d"),o=i("c41b");for(var u in o)["default"].indexOf(u)<0&&function(t){i.d(n,t,(function(){return o[t]}))}(u);i("b847");var r,f=i("0095"),a=Object(f["a"])(o["default"],e["b"],e["c"],!1,null,"55011a90",null,!1,e["a"],r);n["default"]=a.exports},b847:function(t,n,i){"use strict";var e=i("655e"),o=i.n(e);o.a},c41b:function(t,n,i){"use strict";i.r(n);var e=i("6dbf"),o=i.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){i.d(n,t,(function(){return e[t]}))}(u);n["default"]=o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/module/app-order-list-create-component',
     {

mallApp/dist/build/mp-weixin/components/module/app-order-list.wxml

@@ -1 +1 @@
-<view class="list-module _div data-v-f0b99eae"><block wx:if="{{!$root.g0}}"><block class="data-v-f0b99eae"><view class="list-left _div data-v-f0b99eae"><view class="image _div data-v-f0b99eae"><image style="width:68px;height:68px;" src="{{$root.f0}}" alt="商品图片" mode="aspectFill" class="_img data-v-f0b99eae"></image></view><view class="list-msg _div data-v-f0b99eae"><view class="title _div data-v-f0b99eae">{{info.goodsName||info.title}}</view><block wx:if="{{info.goodsStyle&&info.goodsStyle!='0'||info.goodsStyleName&&info.goodsStyleName!='0'}}"><block class="data-v-f0b99eae"><view class="desc _div data-v-f0b99eae">{{info.goodsStyle||info.goodsStyleName}}</view></block></block></view></view><view class="list-right _div data-v-f0b99eae"><view class="price _div data-v-f0b99eae">{{"￥"+(info.price||info.unitPrice)}}</view><view class="num _div data-v-f0b99eae">{{"*"+(info.buyNum||info.num)}}</view></view></block></block></view>
+<view class="list-module _div data-v-55011a90"><block wx:if="{{!$root.g0}}"><block class="data-v-55011a90"><view class="list-left _div data-v-55011a90"><view class="image _div data-v-55011a90"><image style="width:68px;height:68px;" src="{{$root.f0}}" mode="aspectFill" class="_img data-v-55011a90"></image></view><view class="list-msg _div data-v-55011a90"><view class="title _div data-v-55011a90">{{info.goodsName||info.title}}</view><block wx:if="{{info.goodsStyle&&info.goodsStyle!='0'||info.goodsStyleName&&info.goodsStyleName!='0'}}"><block class="data-v-55011a90"><view class="desc _div data-v-55011a90">{{info.goodsStyle||info.goodsStyleName}}</view></block></block></view></view><view class="list-right _div data-v-55011a90"><view class="price _div data-v-55011a90">{{"￥"+(info.price||info.unitPrice)}}</view><view class="num _div data-v-55011a90">{{"*"+(info.buyNum||info.num)}}</view></view></block></block></view>

mallApp/dist/build/mp-weixin/components/module/app-order-list.wxss

@@ -1 +1 @@
-.list-module.data-v-f0b99eae{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 0;border-bottom:1rpx solid #eee}.list-module .list-left.data-v-f0b99eae{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.list-module .list-left .list-msg.data-v-f0b99eae{margin-left:30rpx}.list-module .list-left .list-msg .title.data-v-f0b99eae{font-size:28rpx;color:#666;margin-bottom:10rpx}.list-module .list-left .list-msg .desc.data-v-f0b99eae{color:#999}.list-module .list-right.data-v-f0b99eae{text-align:right;color:#666}.list-module .list-right .price.data-v-f0b99eae{margin-bottom:70rpx;color:#333}
+.list-module.data-v-55011a90{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 0;border-bottom:1rpx solid #eee}.list-module .list-left.data-v-55011a90{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.list-module .list-left .list-msg.data-v-55011a90{margin-left:30rpx}.list-module .list-left .list-msg .title.data-v-55011a90{font-size:28rpx;color:#666;margin-bottom:10rpx}.list-module .list-left .list-msg .desc.data-v-55011a90{color:#999}.list-module .list-right.data-v-55011a90{text-align:right;color:#666}.list-module .list-right .price.data-v-55011a90{margin-bottom:70rpx;color:#333}

mallApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/pages/home/components/goods-list-middle.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/pages/home/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "",
+  "navigationBarTitleText": "首页",
   "usingComponents": {
     "app-swiper": "/components/app-swiper",
     "app-trademark": "/components/module/app-trademark",

mallApp/dist/build/mp-weixin/pages/home/recent.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "首页",
+  "navigationBarTitleText": "最近访问",
   "usingComponents": {
     "app-avatar-module": "/components/module/app-avatar",
     "app-swiper": "/components/app-swiper",

mallApp/dist/build/mp-weixin/pages/order/buy.wxss

@@ -1 +1 @@
-.app-content.data-v-1f3c58e1{padding-top:100rpx;padding-bottom:120rpx;min-height:calc(100vh - 220rpx)}.app-content .module-com.data-v-1f3c58e1{margin-bottom:20rpx;background-color:#fff}.app-content .module-com .module-tit.data-v-1f3c58e1{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-content .module-com .module-det.data-v-1f3c58e1{padding:0 30rpx}.app-content .line-cell .tui-title.data-v-1f3c58e1{width:210rpx;color:#666}.app-content .line-cell .tui-input.data-v-1f3c58e1{width:calc(100% - 210rpx);font-size:28rpx}.app-content .line-cell .tui-placeholder.data-v-1f3c58e1{color:#ccc}.app-content .line-cell .phcolor.data-v-1f3c58e1{color:#ccc}.app-content .shop-price-wrap .module-det.data-v-1f3c58e1{padding-bottom:20rpx}.app-content .shop-price-wrap .shop-prompt.data-v-1f3c58e1{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#666;margin-top:20rpx}.app-content .shop-price-wrap .shop-prompt .iconchangjianwentixiangguanwenti2.data-v-1f3c58e1{color:#ccc;margin-left:10rpx}.app-content .discount-wrap .module-det.data-v-1f3c58e1{padding-top:20rpx;padding-bottom:20rpx}.app-content .none-name-delivery.data-v-1f3c58e1{padding-left:30rpx;margin-top:40rpx}.app-content .none-name-delivery .none-name-text.data-v-1f3c58e1{margin-left:14rpx;color:#666}.page-btn.data-v-1f3c58e1{width:calc(100% - 60rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:0 30rpx}.page-btn .app-price.data-v-1f3c58e1{margin-bottom:8rpx;margin-left:4rpx}.page-btn .red.data-v-1f3c58e1{width:270rpx}.data-v-1f3c58e1 .tui-alert-content{padding:40rpx 40rpx}.alt-content > ._div.data-v-1f3c58e1{margin:10rpx 0}
+.app-content.data-v-3c5df624{padding-top:100rpx;padding-bottom:120rpx;min-height:calc(100vh - 220rpx)}.app-content .module-com.data-v-3c5df624{margin-bottom:20rpx;background-color:#fff}.app-content .module-com .module-tit.data-v-3c5df624{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.app-content .module-com .module-det.data-v-3c5df624{padding:0 30rpx}.app-content .line-cell .tui-title.data-v-3c5df624{width:210rpx;color:#666}.app-content .line-cell .tui-input.data-v-3c5df624{width:calc(100% - 210rpx);font-size:28rpx}.app-content .line-cell .tui-placeholder.data-v-3c5df624{color:#ccc}.app-content .line-cell .phcolor.data-v-3c5df624{color:#ccc}.app-content .shop-price-wrap .module-det.data-v-3c5df624{padding-bottom:20rpx}.app-content .shop-price-wrap .shop-prompt.data-v-3c5df624{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#666;margin-top:20rpx}.app-content .shop-price-wrap .shop-prompt .iconchangjianwentixiangguanwenti2.data-v-3c5df624{color:#ccc;margin-left:10rpx}.app-content .discount-wrap .module-det.data-v-3c5df624{padding-top:20rpx;padding-bottom:20rpx}.app-content .none-name-delivery.data-v-3c5df624{padding-left:30rpx;margin-top:40rpx}.app-content .none-name-delivery .none-name-text.data-v-3c5df624{margin-left:14rpx;color:#666}.page-btn.data-v-3c5df624{width:calc(100% - 60rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:0 30rpx}.page-btn .app-price.data-v-3c5df624{margin-bottom:8rpx;margin-left:4rpx}.page-btn .red.data-v-3c5df624{width:270rpx}.data-v-3c5df624 .tui-alert-content{padding:40rpx 40rpx}.alt-content > ._div.data-v-3c5df624{margin:10rpx 0}

mallApp/dist/build/mp-weixin/pages/order/list.wxss

@@ -1,3 +1,3 @@
-.app-content.data-v-0527c4d1{padding-top:20rpx;padding-bottom:1rpx}.app-content .list-wrap.data-v-0527c4d1{padding:0 30rpx;background-color:#fff;margin-bottom:20rpx}.app-content .list-wrap .list-top.data-v-0527c4d1,
-.app-content .list-wrap .list-bottom.data-v-0527c4d1{padding:20rpx 0;border-bottom:1rpx solid #eee}.app-content .list-wrap .list-top .button-com.data-v-0527c4d1,
-.app-content .list-wrap .list-bottom .button-com.data-v-0527c4d1{padding-top:15rpx;padding-bottom:15rpx}
+.app-content.data-v-a3d6f5d4{padding-top:20rpx;padding-bottom:1rpx}.app-content .list-wrap.data-v-a3d6f5d4{padding:0 30rpx;background-color:#fff;margin-bottom:20rpx}.app-content .list-wrap .list-top.data-v-a3d6f5d4,
+.app-content .list-wrap .list-bottom.data-v-a3d6f5d4{padding:20rpx 0;border-bottom:1rpx solid #eee}.app-content .list-wrap .list-top .button-com.data-v-a3d6f5d4,
+.app-content .list-wrap .list-bottom .button-com.data-v-a3d6f5d4{padding-top:15rpx;padding-bottom:15rpx}

mallApp/src/components/app-delivery.vue

@@ -83,7 +83,7 @@
         >晚上</button>
       </div>
       <tui-list-cell class="line-cell" :hover="false">
-        <div class="tui-title">我的电话</div>
+        <div class="tui-title">订花人电话</div>
         <!-- #ifdef MP-WEIXIN -->
         <input
           v-model="form.bookMobile"
@@ -93,7 +93,7 @@
           disabled
           class="tui-input"
           name="bookMobile"
-          placeholder="送到了通知您（选填）"
+          placeholder="如有问题方便联系您"
           type="number"
         />
         <button

mallApp/src/components/module/app-order-list.vue

@@ -3,7 +3,7 @@
 		<block v-if="!$util.isEmpty(info)">
 			<div class="list-left">
 				<div class="image">
-					<img :src="imgUrl | default_img" alt="商品图片" mode="aspectFill" style="width:68px;height:68px;" />
+					<img :src="imgUrl | default_img" mode="aspectFill" style="width:68px;height:68px;" />
 				</div>
 				<div class="list-msg">
 					<div class="title">{{ info.goodsName || info.title }}</div>
@@ -35,16 +35,23 @@ export default {
 	},
 	computed: {
 		imgUrl() {
-			if (this.$util.isEmpty(this.info)) return '';
+			if (this.$util.isEmpty(this.info)){
+				return '';
+			}
 			let img = '';
-			this.info.goodsStyleList.forEach((ele)=>{
-			    if(ele.id==this.goodsStyleId){
-			        console.log(ele.img)
-                    img = ele.img
+			if(!this.$util.isEmpty(this.info.goodsStyleList)){
+				this.info.goodsStyleList.forEach((ele)=>{
+					if(ele.id==this.goodsStyleId){
+						img = ele.img
+					}
+				})
+				if(!this.$util.isEmpty(img)){
+					return img
 				}
-			})
-			if(!this.$util.isEmpty(img)) return img;
-			return this.info.smallCoverUrl ? this.info.smallCoverUrl : this.info.smallImgList[0]
+			}
+			if(this.info.smallCoverUrl){
+				return this.info.smallCoverUrl
+			}
 		}
 	},
 	mounted() {

mallApp/src/pages.json

@@ -2,13 +2,13 @@
     "pages": [{
             "path": "pages/home/recent",
             "style": {
-                "navigationBarTitleText": "首页"
+                "navigationBarTitleText": "最近访问"
             }
         },
         {
             "path": "pages/home/index",
             "style": {
-                "navigationBarTitleText": ""
+                "navigationBarTitleText": "首页"
             }
         },
         {

mallApp/src/pages/order/buy.vue

@@ -240,6 +240,11 @@ export default {
           this.$msg("请填写送达时间！");
           return false;
         }
+        let bookMobile = form.bookMobile;
+        if (this.$util.isEmpty(bookMobile)) {
+          this.$msg("请填写订花人电话");
+          return false;
+        }
       }
 
       createOrder({

mallApp/src/pages/order/list.vue

@@ -44,14 +44,6 @@
 					})"
             >立即付款</button>
           </block>
-          <!-- <block v-if="item.status == 1">
-						<button class="button-com red defalut" @click.stop="pageTo({
-						url: '/pages/order/buy',
-						query: {
-							id: item.id
-						}
-					})">填写收花地址</button>
-          </block>-->
           <block v-if="item.status == 5">
             <button
               v-if="data.grade == 0"