|
|
@@ -6,21 +6,9 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="ade0a8c5-0639-4f05-956a-aae1181b5d18" name="更改" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/care/pages/offlineTreatment/offlineTreatment.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/care/pages/offlineTreatment/offlineTreatment.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/model/evaluate.model.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/model/evaluate.model.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/logistics-detail/logistics-detail.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/logistics-detail/logistics-detail.scss" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/logistics-detail/logistics-detail.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/logistics-detail/logistics-detail.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/logistics-detail/logistics-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/logistics-detail/logistics-detail.wxml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluate/offline-evaluate.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluate/offline-evaluate.scss" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluate/offline-evaluate.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluate/offline-evaluate.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluate/offline-evaluate.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluate/offline-evaluate.wxml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.scss" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.wxml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/order-detail/order-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/order-detail/order-detail.wxml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/other-detail/other-detail.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/other-detail/other-detail.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/other-detail/other-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/other-detail/other-detail.wxml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/miniprogram/module/order/request.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/request.ts" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/miniprogram/module/chats/pages/consultation-record/consultation-record.scss" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/chats/pages/consultation-record/consultation-record.scss" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/miniprogram/module/chats/pages/consultation-record/consultation-record.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/chats/pages/consultation-record/consultation-record.wxml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/other-detail/other-detail.json" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/other-detail/other-detail.json" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -43,7 +31,7 @@
|
|
|
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
"RunOnceActivity.git.unshallow": "true",
|
|
|
- "git-widget-placeholder": "正在合并 story-afterSale",
|
|
|
+ "git-widget-placeholder": "story-afterSale",
|
|
|
"junie.onboarding.icon.badge.shown": "true",
|
|
|
"last_opened_file_path": "/Users/zhangtiantian/Desktop/six-health.applet",
|
|
|
"node.js.detected.package.eslint": "true",
|
|
|
@@ -76,7 +64,7 @@
|
|
|
<workItem from="1773898120801" duration="598000" />
|
|
|
<workItem from="1774601263134" duration="598000" />
|
|
|
<workItem from="1774842425747" duration="598000" />
|
|
|
- <workItem from="1776043564270" duration="371000" />
|
|
|
+ <workItem from="1776043564270" duration="2172000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|