Merge branch 'dev1.0.0' into develop

components/UiGoodsInfo.vue

@@ -2,22 +2,26 @@
  * @Author: ch
  * @Date: 2022-03-31 14:49:33
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:01:43
+ * @LastEditTime: 2022-04-11 11:28:16
  * @Description: file content
 -->
 <template>
-	<view class="uiGoods">
-		<image class="uiGoods--image" mode="widthFix" :src="data.productImageUrl" />
-		<view >
-			<view class="uiGoods--con">
-				<text class="uiGoods--title">{{data.productName}}</text>
-				<text class="uiGoods--pirce">￥{{data.realAmount}}</text>
-			</view>
-			<view class="uiGoods--desc">
-				<text>{{data.skuDescribe}}</text>
-				<text class="uiGoods--num">x{{data.quantity}}</text>
+	<view class="ui-goods">
+		<view class="ui-goods-item">
+			<image class="ui-goods-item--image" mode="widthFix" :src="data.productImageUrl" />
+			<view >
+				<view class="ui-goods-item--con">
+					<text class="ui-goods-item--title">{{data.productName}}</text>
+					<text class="ui-goods-item--pirce">￥{{data.realAmount}}</text>
+				</view>
+				<view class="ui-goods-item--desc">
+					<text>{{data.skuDescribe}}</text>
+					<text class="ui-goods-item--num">x{{data.quantity}}</text>
+				</view>
+
 			</view>
 		</view>
+		<slot name="operation"></slot>
 	</view>
 </template>
 <script>
@@ -31,47 +35,49 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-	.uiGoods{
+.ui-goods{
+	padding: 30rpx;
+	border-bottom: 1px solid $color-grey2;
+}
+.ui-goods-item{
+	display: flex;
+	justify-content: space-between;
+	&--image{
+		width: 180rpx;
+		height: 180rpx;
+		margin-right: 30rpx;
+	}
+	&--con{
+		width: 510rpx;
+		display: flex;
+		justify-content: space-between;
+		font-size: $font-size-base;
+		color: $color-grey6;
+		line-height: 39rpx;
+	}
+	&--title{
+		overflow:hidden; 
+		text-overflow:ellipsis;
+		display:-webkit-box; 
+		-webkit-box-orient:vertical;
+		-webkit-line-clamp:2; 
+	}
+	&--pirce{
+		font-size: 22rpx;
+		margin-left: 60rpx;
+	}
+	&--desc{
+		width: 510rpx;
+		font-size: $font-size-sm;
+		color: $color-grey4;
+		margin-top: 20rpx;
+		line-height: 39rpx;
 		display: flex;
 		justify-content: space-between;
-		padding: 30rpx;
-		border-bottom: 1px solid $color-grey2;
-		&--image{
-			width: 180rpx;
-			height: 180rpx;
-			margin-right: 30rpx;
-		}
-		&--con{
-			width: 510rpx;
-			display: flex;
-			justify-content: space-between;
-			font-size: $font-size-base;
-			color: $color-grey6;
-			line-height: 39rpx;
-		}
-		&--title{
-			overflow:hidden; 
-			text-overflow:ellipsis;
-			display:-webkit-box; 
-			-webkit-box-orient:vertical;
-			-webkit-line-clamp:2; 
-		}
-		&--pirce{
-			font-size: 22rpx;
-			margin-left: 60rpx;
-		}
-		&--desc{
-			width: 510rpx;
-			font-size: $font-size-sm;
-			color: $color-grey4;
-			margin-top: 20rpx;
-			line-height: 39rpx;
-			display: flex;
-			justify-content: space-between;
-		}
-		&--num{
-			font-size: $font-size-base;
-			margin-left: 60rpx;
-		}
 	}
+	&--num{
+		font-size: $font-size-base;
+		margin-left: 60rpx;
+	}
+}
 </style>

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "马士兵严选",
-    "appid" : "",
+    "appid" : "__UNI__3FB31B6",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -76,16 +76,16 @@
         "devServer" : {
             "proxy" : {
                 "/uc/" : {
-                    "target": "http://192.168.10.52:8090/"
+                    "target" : "http://192.168.10.52:8090/"
                 },
                 "/mall/trade/" : {
-                    "target": "http://192.168.10.52:8090/"
+                    "target" : "http://192.168.10.52:8090/"
                 },
                 "/mall/base/" : {
-                    "target": "http://192.168.10.52:8090/"
+                    "target" : "http://192.168.10.52:8090/"
                 },
                 "/pay/" : {
-                    "target": "http://192.168.10.52:8090/"
+                    "target" : "http://192.168.10.52:8090/"
                 },
                 "/mall/product/" : {
                     "target" : "http://192.168.10.52:8090/"

mobile/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.a572362a.js></script><script src=/static/js/index.5e995dc1.js></script></body></html>

mobile/static/js/pages-order-saleAfter-saleAfterApplication.1545668a.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-order-saleAfter-saleAfterApplication"],{"0a2e":function(t,e,n){"use strict";n.r(e);var a=n("44f7"),i=n.n(a);for(var l in a)"default"!==l&&function(t){n.d(e,t,(function(){return a[t]}))}(l);e["default"]=i.a},"3f3b":function(t,e,n){"use strict";var a=n("f9ea"),i=n.n(a);i.a},"44f7":function(t,e,n){"use strict";var a=n("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=a(n("f196")),l={components:{UiCell:i.default}};e.default=l},"59a3":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"a",(function(){return a}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"uiCell",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.$emit("click")}}},[t._t("icon"),a("v-uni-view",{staticClass:"uiCell--left"},[a("v-uni-text",{staticClass:"uiCell--title"},[t._v(t._s(t.title))]),a("v-uni-text",{staticClass:"uiCell--label"},[t._v(t._s(t.label))])],1),t._t("value",[a("v-uni-text",{staticClass:"uiCell--value"},[t._v(t._s(t.value))])]),t.rightIcon?t._t("right-icon",[a("v-uni-image",{staticClass:"uiCell--rightIcon",attrs:{src:n("6eb6")}})]):t._e()],2)},l=[]},"6eb6":function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAUCAMAAACDMFxkAAAAAXNSR0IArs4c6QAAAGZQTFRFAAAAv7+/v7+/ysrKxsbGy8vLzMzM0NDQy8vLz8/PzMzMysrKzMzMy8vLzMzMy8vLy8vLzc3Ny8vLzMzMzMzMy8vLzc3Nzc3NzMzMzMzMzMzMy8vLzMzMzMzMzMzMy8vLzMzMzMzMIxnl6wAAACF0Uk5TAAQMGCQnKCssOzxIS09QU1RXWG+Dj4+nv9PX5+fv8/v73LQA2wAAAF9JREFUCNdlz0kWgCAMA1Cc5xEHQCz0/pd0IdH3tKu/SlKh90iEU7yCseYFTgxLOLU8wfnpOrgmquDGUwGP/shgyebPgW1+q3VU3qqI6lBBvg+yPH/nxOYZqXhD9vvQBZbIBgiaTuluAAAAAElFTkSuQmCC"},"8eac":function(t,e,n){"use strict";n.r(e);var a=n("c04a"),i=n.n(a);for(var l in a)"default"!==l&&function(t){n.d(e,t,(function(){return a[t]}))}(l);e["default"]=i.a},abd3:function(t,e,n){var a=n("24fb");e=a(!1),e.push([t.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */.uiCell[data-v-4ba2f3f6]{min-height:%?100?%;border-bottom:1px solid #eee;display:flex;justify-content:space-between;align-items:center;background:#fff}.uiCell--title[data-v-4ba2f3f6]{color:#333;font-size:%?28?%;display:block}.uiCell--label[data-v-4ba2f3f6]{color:#999;font-size:%?24?%;display:block;margin-top:%?10?%}.uiCell--value[data-v-4ba2f3f6]{flex:1;padding:0 %?10?%;text-align:right;font-size:%?28?%}.uiCell--rightIcon[data-v-4ba2f3f6]{width:%?10?%;height:%?20?%;margin-left:%?18?%}',""]),t.exports=e},c04a:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={props:{title:{type:String,default:""},label:{type:String,default:""},value:{type:String,default:""},rightIcon:{type:Boolean,default:!0}}};e.default=a},c45e:function(t,e,n){"use strict";n.r(e);var a=n("e1a9"),i=n("0a2e");for(var l in i)"default"!==l&&function(t){n.d(e,t,(function(){return i[t]}))}(l);var u,r=n("f0c5"),s=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,"731540ba",null,!1,a["a"],u);e["default"]=s.exports},e1a9:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"a",(function(){return a}));var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",[n("v-uni-view",[n("UiCell",{attrs:{title:"货物状态"}}),n("UiCell",{attrs:{title:"退款原因"}}),n("UiCell",{attrs:{title:"退款金额"}}),n("UiCell",{attrs:{title:"问题描述"}})],1),n("v-uni-view")],1)},l=[]},f196:function(t,e,n){"use strict";n.r(e);var a=n("59a3"),i=n("8eac");for(var l in i)"default"!==l&&function(t){n.d(e,t,(function(){return i[t]}))}(l);n("3f3b");var u,r=n("f0c5"),s=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,"4ba2f3f6",null,!1,a["a"],u);e["default"]=s.exports},f9ea:function(t,e,n){var a=n("abd3");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var i=n("4f06").default;i("d85769a6",a,!0,{sourceMap:!1,shadowMode:!1})}}]);